Fix XML typos, remove param message so this PR can go in