Fix parsing of gvars