Changes for Scala 2.11