Made some Scala 2.11 compatibility changes