fixes to build process