minor fixes to build system