Fix additional typos from manual merge