Apply feedbacks from Frédéric.