Made minor tweaks to support DrinkBeerViewController