Fix auto checkpoints