tweaks to make checkpointing / schema mismatches easier to fix