fix scala 2.8.1 issues