updates to support scala 2.10