many small fixes to make R CMD check happy