Post-Processing Fixes