More fixes from Nicolas