Backup fixes
Config fixes