cwatson Minor changes to pass CRAN checks