More changes for 2.1.7