Final tweaks to pass R CMD check