Clipper - fixes