less Scala 2.11 warnings