Small tweaks for CRAN-related problems.