More CRAN fixes
CRAN submission tweaks