Changes for CRAN compliance