Little fixes on Drink