diff --git a/DESCRIPTION b/DESCRIPTION
index 37d8a65ab..ed0d20d5c 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -62,4 +62,4 @@ Suggests:
     withr
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.3.2
+RoxygenNote: 7.3.2.9000
diff --git a/R/Connection.R b/R/Connection.R
index 82f3d226b..8e493d5c4 100644
--- a/R/Connection.R
+++ b/R/Connection.R
@@ -1,6 +1,6 @@
 #' DuckDB driver class
 #'
-#' Implements \linkS4class{DBIDriver}.
+#' Implements [DBIDriver-class].
 #'
 #' @aliases duckdb_driver
 #' @keywords internal
@@ -15,7 +15,7 @@ setClass("duckdb_driver", contains = "DBIDriver", slots = list(
 
 #' DuckDB connection class
 #'
-#' Implements \linkS4class{DBIConnection}.
+#' Implements [DBIConnection-class].
 #'
 #' @aliases duckdb_connection
 #' @keywords internal
diff --git a/R/Driver.R b/R/Driver.R
index 99698bd2c..e53eb98c4 100644
--- a/R/Driver.R
+++ b/R/Driver.R
@@ -23,7 +23,7 @@ driver_registry <- new.env(parent = emptyenv())
 #' @description
 #' `duckdb()` creates or reuses a database instance.
 #'
-#' @return `duckdb()` returns an object of class \linkS4class{duckdb_driver}.
+#' @return `duckdb()` returns an object of class [duckdb_driver-class].
 #'
 #' @import methods DBI
 #' @export
diff --git a/R/Result.R b/R/Result.R
index be89bf1f2..e6083ffcd 100644
--- a/R/Result.R
+++ b/R/Result.R
@@ -1,7 +1,7 @@
 #' DuckDB Result Set
 #'
 #' Methods for accessing result sets for queries on DuckDB connections.
-#' Implements \linkS4class{DBIResult}.
+#' Implements [DBIResult-class].
 #'
 #' @aliases duckdb_result
 #' @keywords internal
diff --git a/R/dbConnect__duckdb_driver.R b/R/dbConnect__duckdb_driver.R
index 9b40aebe2..cfdf605eb 100644
--- a/R/dbConnect__duckdb_driver.R
+++ b/R/dbConnect__duckdb_driver.R
@@ -29,8 +29,7 @@
 #'   If `"numeric"` is selected, bigint integers will be treated as double/numeric.
 #'   If `"integer64"` is selected, bigint integers will be set to bit64 encoding.
 #'
-#' @return `dbConnect()` returns an object of class
-#'   \linkS4class{duckdb_connection}.
+#' @return `dbConnect()` returns an object of class [duckdb_connection-class].
 #'
 #' @rdname duckdb
 #' @examples
diff --git a/man/duckdb.Rd b/man/duckdb.Rd
index b1eea5de7..fdc4b8e25 100644
--- a/man/duckdb.Rd
+++ b/man/duckdb.Rd
@@ -64,7 +64,7 @@ Subsequent connections will silently ignore these flags.}
 \item{timezone_out}{The time zone returned to R, defaults to \code{"UTC"}, which
 is currently the only timezone supported by duckdb.
 If you want to display datetime values in the local timezone,
-set to \code{\link[=Sys.timezone]{Sys.timezone()}} or \code{""}.}
+set to \code{\link[base:timezones]{base::Sys.timezone()}} or \code{""}.}
 
 \item{tz_out_convert}{How to convert timestamp columns to the timezone specified
 in \code{timezone_out}. There are two options: \code{"with"}, and \code{"force"}. If \code{"with"}
@@ -84,8 +84,7 @@ side effect.
 
 An object of class "adbc_driver"
 
-\code{dbConnect()} returns an object of class
-\linkS4class{duckdb_connection}.
+\code{dbConnect()} returns an object of class \linkS4class{duckdb_connection}.
 }
 \description{
 \code{duckdb()} creates or reuses a database instance.
diff --git a/man/duckdb_connection-class.Rd b/man/duckdb_connection-class.Rd
index 7c673a8d0..bf367a9c6 100644
--- a/man/duckdb_connection-class.Rd
+++ b/man/duckdb_connection-class.Rd
@@ -140,6 +140,6 @@ with one column per query parameter.}
 \item{object}{Any R object}
 }
 \description{
-Implements \linkS4class{DBIConnection}.
+Implements \link[DBI:DBIConnection-class]{DBI::DBIConnection}.
 }
 \keyword{internal}
diff --git a/man/duckdb_driver-class.Rd b/man/duckdb_driver-class.Rd
index ba0f60106..08f07eac4 100644
--- a/man/duckdb_driver-class.Rd
+++ b/man/duckdb_driver-class.Rd
@@ -34,6 +34,6 @@ or a \linkS4class{DBIResult}}
 \item{object}{Any R object}
 }
 \description{
-Implements \linkS4class{DBIDriver}.
+Implements \link[DBI:DBIDriver-class]{DBI::DBIDriver}.
 }
 \keyword{internal}
diff --git a/man/duckdb_read_csv.Rd b/man/duckdb_read_csv.Rd
index 60e9fe19d..aab04c404 100644
--- a/man/duckdb_read_csv.Rd
+++ b/man/duckdb_read_csv.Rd
@@ -45,7 +45,7 @@ duckdb_read_csv(
 
 \item{transaction}{Should a transaction be used for the entire operation}
 
-\item{...}{Passed on to \code{\link[=read.csv]{read.csv()}}}
+\item{...}{Passed on to \code{\link[utils:read.table]{utils::read.csv()}}}
 }
 \value{
 The number of rows in the resulted table, invisibly.
diff --git a/man/duckdb_result-class.Rd b/man/duckdb_result-class.Rd
index d329e39b0..906ed9d9f 100644
--- a/man/duckdb_result-class.Rd
+++ b/man/duckdb_result-class.Rd
@@ -86,6 +86,6 @@ or a \linkS4class{DBIResult}}
 }
 \description{
 Methods for accessing result sets for queries on DuckDB connections.
-Implements \linkS4class{DBIResult}.
+Implements \link[DBI:DBIResult-class]{DBI::DBIResult}.
 }
 \keyword{internal}