Some corrections in the build system