Fixes to vignettes for R CMD check