more parser fixes [ci skip]