Upgrades and fixes