Fixing typos to make this compile after refactor