diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/AggregateWindowFunctionTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/AggregateWindowFunctionTests.java
index 1bd5ad0e8e..9bbe556be3 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/AggregateWindowFunctionTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/AggregateWindowFunctionTests.java
@@ -363,18 +363,32 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
 
         assertEquals(3, create().fetchCount(selectDistinct(TBook_ID(), TBook_TITLE()).from(TBook()).where(TBook_ID().in(1, 2, 3))));
 
-        // Ingres doesn't allow for LIMIT .. OFFSET in nested selects or derived tables.
-        if (!asList().contains(dialect().family())) {
-            assertEquals(2, create().fetchCount(selectFrom(TBook()).limit(2)));
-            assertEquals(2, create().fetchCount(selectFrom(TBook()).limit(2).offset(1)));
-        }
-
         assertEquals(2, create().fetchCount(
             select(TBook_TITLE()).from(TBook()).where(TBook_ID().eq(1))
             .union(
             select(inline("abc")))));
     }
 
+    @Test
+    public void testFetchCountWithLimitOffset() throws Exception {
+
+        /* [pro] xx
+        xxxxxx xxxxxxxxxxxxxxxxxxxx x
+            xxxx xxxxxxx
+            xxxx xxxx
+            xxxx xxxxxxx
+                xxxxxxxxxxxxxxxxxxxx xxxxxxx xxxxx xx xxxxxx xxxxxxxx
+                xxxxxxx
+        x
+        xx [/pro] */
+
+        // Some databases don't allow for LIMIT .. OFFSET in nested selects or derived tables.
+        if (!asList().contains(dialect().family())) {
+            assertEquals(2, create().fetchCount(selectFrom(TBook()).limit(2)));
+            assertEquals(2, create().fetchCount(selectFrom(TBook()).limit(2).offset(1)));
+        }
+    }
+
     @Test
     public void testCountDistinct() throws Exception {
 
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/FunctionTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/FunctionTests.java
index 09238a3633..abc406ff59 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/FunctionTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/FunctionTests.java
@@ -783,7 +783,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
         Field<Double> f7b = sqlite || ingres ? inline(10.0) : trunc(11.111, -1);
 
         Record r2 =
-        create().select(f1b, f2b, f3b, f4b, f6b, f6b, f7b)
+        create().select(f1b, f2b, f3b, f4b, f5b, f6b, f7b)
                 .fetchOne();
 
         assertEquals("-1.0", r2.getValue(f1b, String.class));
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/GroupByTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/GroupByTests.java
index 8c502f1a19..f8da811a8a 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/GroupByTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/GroupByTests.java
@@ -170,9 +170,8 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
             .groupBy(VLibrary_AUTHOR())
 
             // MySQL seems to have a bug with fully qualified view names in the
-            // having clause. TODO: Fully analyse this issue
-            // https://sourceforge.net/apps/trac/jooq/ticket/277
-            .having("v_library.author like ?", "Paulo%")
+            // having clause. TODO: [#277] Fully analyse this issue
+            .having("count(*) >= ?", 2)
             .fetch();
 
         assertEquals(1, result4.size());
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/OrderByTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/OrderByTests.java
index 59a4e2a708..4b944d5b6d 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/OrderByTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/OrderByTests.java
@@ -451,6 +451,16 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
 
     @Test
     public void testLimitDistinct() throws Exception {
+
+        /* [pro] xx
+        xx xxxxxxxxxx xx xxxxxxxxxxxxxxxxx xx
+            xxxxxxxxx xx xxxxxxxxxxxxxxx x
+
+            xxxxxxxxxxxxxxxxxxxx xxxxxx xxxxxxx xx xxxxxx xxxxxxxxxx
+            xxxxxxx
+        x
+        xx [/pro] */
+
         assertEquals(asList(1, 2),
         create().selectDistinct(TBookToBookStore_BOOK_ID())
                 .from(TBookToBookStore())
@@ -473,14 +483,12 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
                 .limit(2)
                 .offset(1)
                 .fetch(TBook_AUTHOR_ID()));
-
-        throw new RuntimeException("#2580: Add more test cases!");
     }
 
     @Test
     public void testLimitAliased() throws Exception {
         /* [pro] xx
-        xx xxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx x
+        xx xxxxxxxxxxxxxxx xxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx x
             xxxxxxxxxxxxxxxxxxxx xxxxxx xx xxxxxx xxxxxxxx
             xxxxxxx
         x
@@ -620,6 +628,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
         /* [pro] xx
         xx xxxx xxxxxx xxxx xx xxx xxxxxxxxx xx xxxxxx
         xx xxxxxxxxxx xx xxxxxxxxxxxxxxxxx xx
+            xxxxxxxxx xx xxxxxxxxxxxxxxxxx xx
             xxxxxxxxx xx xxxxxxxxxxxxxxx x
 
             xxxxxxxxxxxxxxxxxxxx xxxxxx xxxxxxx xx xxxxxx xxxxxxxxxx
diff --git a/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java b/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
index c0160f9d54..34603be778 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
@@ -2105,6 +2105,11 @@ public abstract class jOOQAbstractTest<
         new AggregateWindowFunctionTests(this).testFetchCount();
     }
 
+    @Test
+    public void testFetchCountWithLimitOffset() throws Exception {
+        new AggregateWindowFunctionTests(this).testFetchCountWithLimitOffset();
+    }
+
     @Test
     public void testCountDistinct() throws Exception {
         new AggregateWindowFunctionTests(this).testCountDistinct();
diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultRenderContext.java b/jOOQ/src/main/java/org/jooq/impl/DefaultRenderContext.java
index 0d2dc8254b..49a69e5ba6 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultRenderContext.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultRenderContext.java
@@ -413,6 +413,13 @@ class DefaultRenderContext extends AbstractContext<RenderContext> implements Ren
 
             switch (configuration().dialect().family()) {
                 /* [pro] xx
+                xxxx xxxxxxx
+
+                    xx xxxxxxxxxxx xxxx xxxxx xxxx xxx xxxxx xxxxx xx xx xxx xxxx xxxxxxxxx xxx xx xxxxxx
+                    xx xxxxx xxxxxxx xxxx xxxxxx xx xxxx xx xxx xxxx xxxx
+                    xxxxxxxxxxxxxxxxxxxxxx
+                    xxxxxxx
+
                 xxxx xxxx
                     xxxxxxxxxxxxxxxxxxxxxxx
                     xxxxxxx
diff --git a/jOOQ/src/main/java/org/jooq/impl/Values.java b/jOOQ/src/main/java/org/jooq/impl/Values.java
index 370bb2c264..ddf66699e1 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Values.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Values.java
@@ -105,6 +105,7 @@ class Values<R extends Record> extends AbstractTable<R> {
             xxxx xxxxxxx
             xxxx xxxxxxx
             xxxx xxxxxxx
+            xxxx xxxxxxx
             xx [/pro] */
             case FIREBIRD:
             case MARIADB: