Fix type annotations for scala 2.10