Minor fixes for CRAN acceptance