R CMD CHECK fixes.
Update for latest package version.