Fixes to b-backup