More changes to 7.x