Parser fixes
More fixes