minor fixes to the build system