Fix compilation for scala 2.11