diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java b/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java
index d05b45971e..9a9e1e1f51 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java
@@ -4690,6 +4690,9 @@ public class JavaGenerator extends AbstractGenerator {
         return getJavaType(type1).equals(getJavaType(type2));
     }
 
+    /* [java-8] */
+    @SafeVarargs
+    /* [/java-8] */
     private static final <T> List<T> list(T... objects) {
         List<T> result = new ArrayList<T>();
 
@@ -4701,6 +4704,7 @@ public class JavaGenerator extends AbstractGenerator {
         return result;
     }
 
+    @SuppressWarnings("unchecked")
     private static final <T> List<T> list(T first, List<T> remaining) {
         List<T> result = new ArrayList<T>();
 
diff --git a/jOOQ/src/main/java/org/jooq/DSLContext.java b/jOOQ/src/main/java/org/jooq/DSLContext.java
index 1a26c5fc01..fa9db512b1 100644
--- a/jOOQ/src/main/java/org/jooq/DSLContext.java
+++ b/jOOQ/src/main/java/org/jooq/DSLContext.java
@@ -885,7 +885,7 @@ public interface DSLContext extends Scope /* [java-8] */, AutoCloseable /* [/jav
      * be fetched (or iterated over) lazily, fetching records from the
      * {@link ResultSet} one by one.
      * <p>
-     * Unlike {@link #stream(String, Object...)}, the SQL passed to this
+     * Unlike {@link #fetchStream(String, Object...)}, the SQL passed to this
      * method should not contain any bind variables. Instead, you can pass
      * {@link QueryPart} objects to the method which will be rendered at indexed
      * locations of your SQL string as such: <code><pre>