[FOLD] Review tweaks