Fixed TODOs with save xml problem.