More fixes for clipping