Fix intermittent restore failures.
Various cleanup
Fix restoring from incremental missing full.
Various cleanup