Fixed some soft delete issues