More bugfixes for post processing code