Fix minor typo
Incorrect variable name
Manual merge