A few minor global restore and backup fixes (and maybe breaks)