Fix typos from refactor