fixes for parsers (after migration to scala 2.10) + scala 2.10.2