diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/CustomSql.java b/hibernate-core/src/main/java/org/hibernate/boot/model/CustomSql.java
index 71d211e3e8..afcb088811 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/CustomSql.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/CustomSql.java
@@ -10,7 +10,7 @@ import org.hibernate.engine.spi.ExecuteUpdateResultCheckStyle;
 
 /**
  * Models the information for custom SQL execution defined as part of
- * the mapping for a primary/secondary table
+ * the mapping for a primary or secondary table.
  *
  * @author Steve Ebersole
  */
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/TypeDefinitionRegistryStandardImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/model/TypeDefinitionRegistryStandardImpl.java
index 815ffe6bc6..fc1bb08fa0 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/model/TypeDefinitionRegistryStandardImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/model/TypeDefinitionRegistryStandardImpl.java
@@ -16,6 +16,8 @@ import org.hibernate.type.descriptor.java.BasicJavaType;
 import org.jboss.logging.Logger;
 
 /**
+ * Basic implementation of {@link TypeDefinitionRegistry}.
+ *
  * @author Chris Cranford
  */
 public class TypeDefinitionRegistryStandardImpl implements TypeDefinitionRegistry {
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/BootstrapContext.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/BootstrapContext.java
index 72053997a0..5e7b5ed38d 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/spi/BootstrapContext.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/BootstrapContext.java
@@ -18,7 +18,6 @@ import org.hibernate.boot.archive.scan.spi.ScanEnvironment;
 import org.hibernate.boot.archive.scan.spi.ScanOptions;
 import org.hibernate.boot.archive.spi.ArchiveDescriptorFactory;
 import org.hibernate.boot.internal.ClassmateContext;
-import org.hibernate.boot.model.TypeBeanInstanceProducer;
 import org.hibernate.boot.model.convert.spi.ConverterDescriptor;
 import org.hibernate.boot.model.relational.AuxiliaryDatabaseObject;
 import org.hibernate.boot.registry.StandardServiceRegistry;
@@ -59,8 +58,7 @@ public interface BootstrapContext {
 	/**
 	 * The {@link BeanInstanceProducer} to use when creating custom type references.
 	 *
-	 * @implNote Generally this will be a {@link TypeBeanInstanceProducer}
-	 * reference
+	 * @implNote Usually a {@link org.hibernate.boot.model.TypeBeanInstanceProducer}.
 	 */
 	BeanInstanceProducer getCustomTypeProducer();