Fix additional typos form manual merge