Partially fix parser
CLI parser