storage/backup corner cases handled