some more fixes to build