Fixed some CRAN issues for a future update