Some more minor xml code fixes