Upgrade some things