Fixes for latest Scala 2.11.0-SNAPSHOT.