Integrate comments from Olivier.