Lots of fixes for backups.

Signed-off-by: Paul Buonopane <paul+git@earth2me.com>