Scala 2.10 cleanup..


Get rid of compile warnings...