diff --git a/jOOQ/src/main/java/org/jooq/Context.java b/jOOQ/src/main/java/org/jooq/Context.java
index d87928a7bf..0405298c0e 100644
--- a/jOOQ/src/main/java/org/jooq/Context.java
+++ b/jOOQ/src/main/java/org/jooq/Context.java
@@ -87,7 +87,7 @@ public interface Context<C extends Context<C>> extends Configuration {
      * <ul>
      * <li>When binding variables to a {@link PreparedStatement}. Client code
      * must assure that calling {@link #nextIndex()} is followed by setting a
-     * bind value to {@link #statement()}</li>
+     * bind value to {@link BindContext#statement()}</li>
      * <li>When rendering unnamed bind variables with
      * {@link RenderContext#namedParams()} being to <code>true</code></li>
      * </ul>
diff --git a/jOOQ/src/main/java/org/jooq/MergeMatchedDeleteStep.java b/jOOQ/src/main/java/org/jooq/MergeMatchedDeleteStep.java
index fc9ca0358c..704dd0c5dd 100644
--- a/jOOQ/src/main/java/org/jooq/MergeMatchedDeleteStep.java
+++ b/jOOQ/src/main/java/org/jooq/MergeMatchedDeleteStep.java
@@ -64,10 +64,11 @@ public interface MergeMatchedDeleteStep<R extends Record> extends MergeNotMatche
      * <p>
      * <b>Note:</b> This syntax is only available for the
      * {@link SQLDialect#ORACLE} database!
-     *
-     * @see <a
-     *      href="http://docs.oracle.com/cd/B19306_01/server.102/b14200/statements_9016.htm">http://docs.oracle.com/cd/B19306_01/server.102/b14200/statements_9016.htm</a>
-     *      for a full definition of the Oracle <code>MERGE</code> statement
+     * <p>
+     * See <a href=
+     * "http://docs.oracle.com/cd/B19306_01/server.102/b14200/statements_9016.htm"
+     * >http://docs.oracle.com/cd/B19306_01/server.102/b14200/statements_9016.
+     * htm</a> for a full definition of the Oracle <code>MERGE</code> statement
      */
     @Support(ORACLE)
     MergeNotMatchedStep<R> deleteWhere(Condition condition);
diff --git a/jOOQ/src/main/java/org/jooq/MergeMatchedWhereStep.java b/jOOQ/src/main/java/org/jooq/MergeMatchedWhereStep.java
index 980af54c22..cc61ffe77e 100644
--- a/jOOQ/src/main/java/org/jooq/MergeMatchedWhereStep.java
+++ b/jOOQ/src/main/java/org/jooq/MergeMatchedWhereStep.java
@@ -64,10 +64,11 @@ public interface MergeMatchedWhereStep<R extends Record> extends MergeNotMatched
      * <p>
      * <b>Note:</b> This syntax is only available for the
      * {@link SQLDialect#ORACLE} database!
-     *
-     * @see <a
-     *      href="http://docs.oracle.com/cd/B19306_01/server.102/b14200/statements_9016.htm">http://docs.oracle.com/cd/B19306_01/server.102/b14200/statements_9016.htm</a>
-     *      for a full definition of the Oracle <code>MERGE</code> statement
+     * <p>
+     * See <a href=
+     * "http://docs.oracle.com/cd/B19306_01/server.102/b14200/statements_9016.htm"
+     * >http://docs.oracle.com/cd/B19306_01/server.102/b14200/statements_9016.
+     * htm</a> for a full definition of the Oracle <code>MERGE</code> statement
      */
     @Support(ORACLE)
     MergeMatchedDeleteStep<R> where(Condition condition);
diff --git a/jOOQ/src/main/java/org/jooq/MergeNotMatchedWhereStep.java b/jOOQ/src/main/java/org/jooq/MergeNotMatchedWhereStep.java
index 07ece19319..c221257b4d 100644
--- a/jOOQ/src/main/java/org/jooq/MergeNotMatchedWhereStep.java
+++ b/jOOQ/src/main/java/org/jooq/MergeNotMatchedWhereStep.java
@@ -64,10 +64,11 @@ public interface MergeNotMatchedWhereStep<R extends Record> extends MergeFinalSt
      * <p>
      * <b>Note:</b> This syntax is only available for the
      * {@link SQLDialect#ORACLE} database!
-     *
-     * @see <a
-     *      href="http://docs.oracle.com/cd/B19306_01/server.102/b14200/statements_9016.htm">http://docs.oracle.com/cd/B19306_01/server.102/b14200/statements_9016.htm</a>
-     *      for a full definition of the Oracle <code>MERGE</code> statement
+     * <p>
+     * See <a href=
+     * "http://docs.oracle.com/cd/B19306_01/server.102/b14200/statements_9016.htm"
+     * >http://docs.oracle.com/cd/B19306_01/server.102/b14200/statements_9016.
+     * htm</a> for a full definition of the Oracle <code>MERGE</code> statement
      */
     @Support(ORACLE)
     MergeFinalStep<R> where(Condition condition);
diff --git a/jOOQ/src/main/java/org/jooq/SelectOnStep.java b/jOOQ/src/main/java/org/jooq/SelectOnStep.java
index aaedfa02e6..bd49390180 100644
--- a/jOOQ/src/main/java/org/jooq/SelectOnStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectOnStep.java
@@ -120,9 +120,9 @@ public interface SelectOnStep {
      * Join the previous table on a non-ambiguous foreign key relationship
      * between the two joined tables.
      * <p>
-     * See {@link Table#onKey(Key)} for examples.
+     * See {@link TableOnStep#onKey(ForeignKey)} for examples.
      *
-     * @see Table#onKey(Key)
+     * @see TableOnStep#onKey(ForeignKey)
      * @throws DataAccessException If there is no non-ambiguous key definition
      *             known to jOOQ
      */
@@ -133,9 +133,9 @@ public interface SelectOnStep {
      * Join the previous table on a non-ambiguous foreign key relationship
      * between the two joined tables.
      * <p>
-     * See {@link Table#onKey(Key)} for examples.
+     * See {@link TableOnStep#onKey(ForeignKey)} for examples.
      *
-     * @see Table#onKey(Key)
+     * @see TableOnStep#onKey(ForeignKey)
      * @throws DataAccessException If there is no non-ambiguous key definition
      *             known to jOOQ
      */
@@ -146,9 +146,9 @@ public interface SelectOnStep {
      * Join the table on a non-ambiguous foreign key relationship between the
      * two joined tables.
      * <p>
-     * See {@link Table#onKey(Key)} for examples.
+     * See {@link TableOnStep#onKey(ForeignKey)} for examples.
      *
-     * @see Table#onKey(Key)
+     * @see TableOnStep#onKey(ForeignKey)
      */
     @Support
     SelectJoinStep onKey(ForeignKey<?, ?> key);
diff --git a/jOOQ/src/main/java/org/jooq/SelectQuery.java b/jOOQ/src/main/java/org/jooq/SelectQuery.java
index 44092a4be6..f274152fb4 100644
--- a/jOOQ/src/main/java/org/jooq/SelectQuery.java
+++ b/jOOQ/src/main/java/org/jooq/SelectQuery.java
@@ -138,7 +138,7 @@ public interface SelectQuery extends Select<Record>, ConditionProvider, OrderPro
      *
      * @param table The joined table
      * @param type The type of join
-     * @see Table#onKey(Key)
+     * @see TableOnStep#onKey(ForeignKey)
      * @throws DataAccessException If there is no non-ambiguous key definition
      *             known to jOOQ
      */
@@ -151,7 +151,7 @@ public interface SelectQuery extends Select<Record>, ConditionProvider, OrderPro
      * @param table The joined table
      * @param type The type of join
      * @param keyFields The foreign key fields
-     * @see Table#onKey(Key)
+     * @see TableOnStep#onKey(ForeignKey)
      * @throws DataAccessException If there is no non-ambiguous key definition
      *             known to jOOQ
      */
@@ -164,7 +164,7 @@ public interface SelectQuery extends Select<Record>, ConditionProvider, OrderPro
      * @param table The joined table
      * @param type The type of join
      * @param key The foreign key
-     * @see Table#onKey(Key)
+     * @see TableOnStep#onKey(ForeignKey)
      */
     @Support
     void addJoinOnKey(TableLike<?> table, JoinType type, ForeignKey<?, ?> key);
diff --git a/jOOQ/src/main/java/org/jooq/TableOnStep.java b/jOOQ/src/main/java/org/jooq/TableOnStep.java
index ef737de737..4cdbdc7ff3 100644
--- a/jOOQ/src/main/java/org/jooq/TableOnStep.java
+++ b/jOOQ/src/main/java/org/jooq/TableOnStep.java
@@ -104,9 +104,9 @@ public interface TableOnStep {
      * Join the table on a non-ambiguous foreign key relationship between the
      * two joined tables.
      * <p>
-     * See {@link #onKey(Key)} for examples.
+     * See {@link #onKey(ForeignKey)} for examples.
      *
-     * @see #onKey(Key)
+     * @see #onKey(ForeignKey)
      * @throws DataAccessException If there is no non-ambiguous key definition
      *             known to jOOQ
      */
@@ -117,9 +117,9 @@ public interface TableOnStep {
      * Join the table on a non-ambiguous foreign key relationship between the
      * two joined tables.
      * <p>
-     * See {@link #onKey(Key)} for examples.
+     * See {@link #onKey(ForeignKey)} for examples.
      *
-     * @see #onKey(Key)
+     * @see #onKey(ForeignKey)
      * @throws DataAccessException If there is no non-ambiguous key definition
      *             known to jOOQ
      */