VOL-36 - Upgrades for 4.5 compatability