More changes for 4.0