Corrections on Olivier's suggestions