Backup DB and a few changes on code