Fixes for the build process