Upgrade some stuff