Fixes for CRAN