Fixed a couple of Scala 2.11 warnings