A few bugfixes related to post-processing