minor fixes to build process