Several updates to help R CMD check