Fixing build scripts