More fixes by Nicolas