More fixes for build process