Updates to pass R CMD CHECK.