Small post-processing improvements