fixes to parser [ci skip]