Some Backup & Restore fixes.

Still a bit buggy