Checkpoint

A couple of tweaks.