More changes for 1.7.2