order xml fixes