Fix many Scala 2.11 warnings