Compiles under 2.10
minor fixes
utils.test passes
All tests pass