Fixing xml, 1 commit at a time.