minor fixes for scala 2.10.2