Fix checkpoints;