Fixes based on CRAN maintainers' comments