fixes for CRAN