More compaction tweaks