fix variables missed during some refactoring