minimal changes to compile with scala 2.10.1