Some updates for Clipper.