Fix warnings after moving to scala 2.10.2