More changes for 3.x