Improves the build scripts to fix bad configurations