More fixes ...