Xml updates

Some minor tweaks