More fixes requested