More Scala 2.11 adjustments