Fixed backup to be better with archiving and encryption