Add fix to Undefined Variables notices