diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/JdbcType.java b/hibernate-core/src/main/java/org/hibernate/annotations/JdbcType.java
index f4c875363e..0bb1ea2cdc 100644
--- a/hibernate-core/src/main/java/org/hibernate/annotations/JdbcType.java
+++ b/hibernate-core/src/main/java/org/hibernate/annotations/JdbcType.java
@@ -33,8 +33,8 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
  *         For other collection mappings, describes the elements
  *     </li>
  *     <li>
- *         For discriminated association mappings (`@Any` and `@ManyToAny`), describes the discriminator
- *         value.
+ *         For discriminated association mappings ({@link Any @Any} and {@link ManyToAny @ManyToAny}), describes the
+ *         discriminator value.
  *     </li>
  * </ul>
  *
diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/JdbcTypeCode.java b/hibernate-core/src/main/java/org/hibernate/annotations/JdbcTypeCode.java
index ac7b6a7432..4a154447f9 100644
--- a/hibernate-core/src/main/java/org/hibernate/annotations/JdbcTypeCode.java
+++ b/hibernate-core/src/main/java/org/hibernate/annotations/JdbcTypeCode.java
@@ -36,8 +36,8 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
  *         For other collection mappings, describes the elements
  *     </li>
  *     <li>
- *         For discriminated association mappings (`@Any` and `@ManyToAny`), describes the discriminator
- *         value.
+ *         For discriminated association mappings ({@link Any @Any} and {@link ManyToAny @ManyToAny}), describes the
+ *         discriminator value.
  *     </li>
  * </ul>
  * <p>
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java
index 2dc8bd8ba1..689b40f384 100644
--- a/hibernate-core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java
+++ b/hibernate-core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java
@@ -196,7 +196,7 @@ public class JoinedSubclassEntityPersister extends AbstractEntityPersister {
 		final Dialect dialect = creationContext.getDialect();
 		final SqmFunctionRegistry functionRegistry = creationContext.getFunctionRegistry();
 		final TypeConfiguration typeConfiguration = creationContext.getTypeConfiguration();
-		final BasicTypeRegistry basicTypeRegistry = creationContext.getTypeConfiguration().getBasicTypeRegistry();
+		final BasicTypeRegistry basicTypeRegistry = typeConfiguration.getBasicTypeRegistry();
 
 		// DISCRIMINATOR
 
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BooleanJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BooleanJavaType.java
index d392881b53..b83a44643b 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BooleanJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/BooleanJavaType.java
@@ -16,6 +16,8 @@ import org.hibernate.type.descriptor.jdbc.JdbcType;
 /**
  * Descriptor for {@link Boolean} handling.
  *
+ * @see org.hibernate.cfg.AvailableSettings#PREFERRED_BOOLEAN_JDBC_TYPE
+ *
  * @author Steve Ebersole
  */
 public class BooleanJavaType extends AbstractClassJavaType<Boolean> implements
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DurationJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DurationJavaType.java
index 299f5fa1c6..051070d3a6 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DurationJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/DurationJavaType.java
@@ -29,6 +29,8 @@ import org.hibernate.type.descriptor.jdbc.JdbcTypeIndicators;
  * Java {@link Duration} to SQL {@code numeric(21)} here, which
  * can comfortably represent 60 millennia of nanos.
  *
+ * @see org.hibernate.cfg.AvailableSettings#PREFERRED_DURATION_JDBC_TYPE
+ *
  * @author Steve Ebersole
  * @author Gavin King
  */
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/InstantJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/InstantJavaType.java
index 9400520bfe..c34af011a4 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/InstantJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/InstantJavaType.java
@@ -29,6 +29,8 @@ import org.hibernate.type.spi.TypeConfiguration;
 /**
  * Java type descriptor for the Java {@link Instant} type.
  *
+ * @see org.hibernate.cfg.AvailableSettings#PREFERRED_INSTANT_JDBC_TYPE
+ *
  * @author Steve Ebersole
  */
 public class InstantJavaType extends AbstractTemporalJavaType<Instant>
diff --git a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/UUIDJavaType.java b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/UUIDJavaType.java
index 8321e49cd6..3618cd66de 100644
--- a/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/UUIDJavaType.java
+++ b/hibernate-core/src/main/java/org/hibernate/type/descriptor/java/UUIDJavaType.java
@@ -18,6 +18,8 @@ import org.hibernate.type.descriptor.jdbc.JdbcTypeIndicators;
 /**
  * Descriptor for {@link UUID} handling.
  *
+ * @see org.hibernate.cfg.AvailableSettings#PREFERRED_UUID_JDBC_TYPE
+ *
  * @author Steve Ebersole
  */
 public class UUIDJavaType extends AbstractClassJavaType<UUID> {