More changes for 1.8.7 compatibility