Clean up some xml errors