Fix CRAN issues

Fixes #117.