More fixes for beer and capture