Fix a few (not all) R CMD Check issues