Fixes for SoftDeleteManager tools