Fixes for latest roxygen.