[major] manual post-processing fixes