More changes to get the build to work properly