Fixed compilation issues with Scala 2.10.