Various fixes related to emotes and beverages.