Minor fixes suggested by Jean-Marie and Helen