some fixes for CRAN