Fixes for dropping/reordering during preserve