[PATCH 0/2] Fixes for compaction_test