Oliver Keyes CRAN fixes