More changes for 4.1