Fixes for soft delete