Clipping mask bug fixes