Updates to prepare for in-place compaction support