Some changes after R CMD check