Having water with me/beside me seems to help me a lot. Theres no oh I’m thirsty i better stop and buy water or go get water, i always try to have some so as soon as a little bit of thirst hits i can drink it right away. Otherwise i find myself saying oh I’ll go get water in 5 minutes, and 3 hours later still not got any water.