Fixed more undefined variables.