Checkpoint tweaks for NmSimple.