Upgrades and fixes.