Thirst fixes