Fix variable.undefined (and other) errors (#9513)

Fix variable.undefined (and other) errors (#9513) #10562