Integrate changes suggested by Arnaud D.