CRAN submission fixes