Continued fixing accidental local variables