Fixup build for Scala 2.10