Adjustments for CRAN upload