Adjusted build scripts