Final fixes after R CMD check