[fold] Corrections based on review feedback #768