Fixes to address issues submitting to CRAN.