minor fixes so R CMD check doesn't die