Minor upgrades