CRAN 0.54 Parity

Changes to accomodate CRAN policies.