Latest 3.1 upgrades