Scala211 upgrades