Corrections due to CRAN suggestions