Minor fixes suggested by Fabien