Restore and Backup fixes.