Back port to build scripts