Upgrade a few more things