Checkpoint maintenance