Post-processing fixes