Fix some scala 2.11 compilation errors