CRAN check fixes