Minor updates for CRAN pass