Minor backups cleanups.

These are changes that should have been in earlier patches.