improve source compatibility with Scala 2.11