Lots of fixes to pass R CMD CHECK. #34