Fixed xml problems