Multiple fix to the build system.