diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java
index bc28971b8f..cf971cad4a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DSL.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java
@@ -17475,6 +17475,24 @@ public class DSL {
         return new Least<>(nullSafeDataType(field), nullSafe(combine(field, others)));
     }
 
+    /**
+     * Get the <code>WIDTH_BUCKET</code> function which divides a range (low,
+     * high) in buckets of equal size.
+     */
+    @Support
+    public static <T extends Number> Field<T> widthBucket(Field<T> field, T low, T high, int buckets) {
+        return widthBucket(field, Tools.field(low, field), Tools.field(high, field), Tools.field(buckets));
+    }
+
+    /**
+     * Get the <code>WIDTH_BUCKET</code> function which divides a range (low,
+     * high) in buckets of equal size.
+     */
+    @Support
+    public static <T extends Number> Field<T> widthBucket(Field<T> field, Field<T> low, Field<T> high, Field<Integer> buckets) {
+        return new WidthBucket<>(field, low, high, buckets);
+    }
+
     /**
      * Negate a field to get its negative value.
      *
@@ -23698,7 +23716,7 @@ public class DSL {
     }
 
     // -------------------------------------------------------------------------
-    // XXX other functions
+    // XXX System functions
     // -------------------------------------------------------------------------
 
     /**
@@ -23717,16 +23735,6 @@ public class DSL {
         return new CurrentSchema();
     }
 
-    @Support
-    public static <T extends Number> Field<T> widthBucket(Field<T> field, T low, T high, int buckets) {
-        return widthBucket(field, Tools.field(low, field), Tools.field(high, field), Tools.field(buckets));
-    }
-
-    @Support
-    public static <T extends Number> Field<T> widthBucket(Field<T> field, Field<T> low, Field<T> high, Field<Integer> buckets) {
-        return new WidthBucket<>(field, low, high, buckets);
-    }
-
     // -------------------------------------------------------------------------
     // XXX utility API
     // -------------------------------------------------------------------------
diff --git a/jOOQ/src/main/java/org/jooq/impl/NullIf.java b/jOOQ/src/main/java/org/jooq/impl/NullIf.java
index 583c0c23fb..8ae63def35 100644
--- a/jOOQ/src/main/java/org/jooq/impl/NullIf.java
+++ b/jOOQ/src/main/java/org/jooq/impl/NullIf.java
@@ -74,7 +74,7 @@ final class NullIf<T> extends AbstractField<T> {
 
 
             default:
-                ctx.visit(N_NULLIF).sql('(').visit(arg1).sql(",").visit(arg2).sql(')');
+                ctx.visit(N_NULLIF).sql('(').visit(arg1).sql(", ").visit(arg2).sql(')');
                 break;
         }
     }