Make some more things compatible with drinks.