[snapshot/restore] Corrections after the second phase of review