And still some more fixes to the parsers