Update build for Scala 2.10

Not all tests passed (all tests related to the changes I made passed).