Checkpoint recovery fixes