Add clipping, small compatibility fix