Fix issues.
Merge branch 'postprocess' into testpostprocess