More updates for latest roxygen.