Changes to pass R CMD CHECK.