Fixed: Various fixes for the build system