Align with current CRAN policies