Switch to Scala 2.11 and a small fix

Details in commit messages.