Fixed more out-of-scope variables.