Fixes for scala 2.10