Some small fixes re: R CMD check