Correct some elements for 3.2 flat