Fixed problems with Scala 2.11