few more fixes
Commit to make jenkins run scala 2.11 tests.