added fixes to build process