more changes for roxygen 4.0