Fix namespace issues for CRAN