Beverage fixes, roundtrip working 100%