More changes towards getting the build working