Fixing Builds and updating build-scripts