Updated build scripts