Fixed Scala 2.11 deprecation warnings