xml out fixes