Minor changes for CRAN compliance