small fixes to pass "R CMD check --as-cran"