More changes to build