Updates for Scala 2.10