checkpoint: last minor tweaks