Some fixes for Scala 2.10