More upgrades as noted in comments