more fixes for CRAN warnings