More fixes for i4