Review and fix backup errors

Review and fix backup errors
Review and fix backup errors