Tweaks to cmpackage framework