Correct some typos and weird messages