more fixes for cran