Drink and MoneyAmount fixes