Upgrade versions of Scala stuff