Changes for supporting Scala 2.10