Fixes for Scala 2.10