Fixes after R CMD check