dicook fixes for CRAN