scala 2.11-M2 target and fixes