R CMD CHECK fixes.