Fix variables from Baseline HHQ