Make crash recovery work with reconf.

Various minor changes.