Other changes needed for Scala 2.11