Changes needed for Scala 2.10