Update commit following Damien's comments.