Various bug fixes, create cpackage-clone.