parser validation on production fixes