Fixed build scripts