preparing for scala 2.11