Update fo CRAN compatibility