Fix several more typos from refactor