Restore.c bug fixes / cleanup patches.

Printable View