Cran fixes