changes to compile on scala 2.10