fix deprecation warnings for Scala 2.11
some more cosmetic changes