thk686 CRAN fixes