Changes to conform to CRAN policies