More upgrades and fixes