Updated code to fix a few CRAN specific issues.