a few tweaks so that R CMD check passes