Fixes in the build system