More changes for 6.0.2