R CMD CHECK fixes