Upgrades for 4.5 compatability