Checkpoint update
Fixes