R CMD check fixes