Clipping mask fixes