more fixes to the build system