Add cliparts...
Fixes and workarounds.