Address some 'variable not defined' issues.