Fixes to address new R CMD CHECK notes and warnings.