fixes to build