More fixes on parsers