Minor XML Changes

Final Push for me.