Getting new build scripts to feature parity with old ones