diff --git a/jOOQ/src/main/java/org/jooq/impl/QueryPartList.java b/jOOQ/src/main/java/org/jooq/impl/QueryPartList.java
index 0014c927ac..31e8f0820b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/QueryPartList.java
+++ b/jOOQ/src/main/java/org/jooq/impl/QueryPartList.java
@@ -99,14 +99,14 @@ class QueryPartList<T extends QueryPart> extends AbstractQueryPart implements Li
                 ctx.sql(separator);
 
                 if (i > 0 || indent)
-                    ctx.formatSeparator();
+                    ctx.formatNewLine();
 
                 ctx.visit(get(i));
-                separator = ",";
+                separator = ", ";
             }
 
             if (indent)
-                ctx.formatIndentEnd();
+                ctx.formatIndentEnd().formatNewLine();
         }
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/WithImpl.java b/jOOQ/src/main/java/org/jooq/impl/WithImpl.java
index b4fc65af4c..84720703a1 100644
--- a/jOOQ/src/main/java/org/jooq/impl/WithImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/WithImpl.java
@@ -190,7 +190,7 @@ implements
         ctx.keyword("with")
            .sql(' ');
 
-        if (recursive && !asList().contains(ctx.family()))
+        if (recursive && !asList().contains(ctx.configuration().dialect().family()))
             ctx.keyword("recursive")
                .sql(' ');