checkpoints margin fixes