more CRAN "fixes"