Corrections for Scala 2.11