Tweaks to allow for upgrade to Scala 2.10