Upgrade other misc stuff