[all] Issue #592 - Corrections (GVARS)