A million changes to pass CRAN check