More fixes to the parsers and conditions