Minor fixes to compile under Scala 2.10

Just a few minor fixes to get the project to compile under Scala 2.10 without warnings