More changes as a result of rebuild