Further adjustments to checkpoint.cc