fixes to make it work with BeerGang