more fixes for CRAN