more fixes for cran submission