Final post processing fixes