Correct some flow conversion items