Fix entity issue when mixing checkpoints and delta tracking.