Upgrades for 1.6 compatibility