Do some upgrades