A few more fixes for clipping