Post-crit tweaks 1