some fixes for genbeans