More fixes for stored checkpoints