Few bug fixes in backup-functions