Backup files and a small fix