Fixed typos and merge weirdness