fixing other variable references that were missed