More CRAN fixes