Fixes for CRAN.