diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/SessionFactoryOptions.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/SessionFactoryOptions.java
index 39a5c463c9..b292d19019 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/spi/SessionFactoryOptions.java
+++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/SessionFactoryOptions.java
@@ -453,6 +453,10 @@ public interface SessionFactoryOptions extends QueryEngineOptions {
 	}
 
 	/**
+	 * Should HQL integer division HQL should produce an integer on
+	 * Oracle, MySQL, and MariaDB, where the {@code /} operator produces
+	 * a non-integer.
+	 *
 	 * @see org.hibernate.cfg.AvailableSettings#PORTABLE_INTEGER_DIVISION
 	 */
 	@Override
@@ -461,11 +465,18 @@ public interface SessionFactoryOptions extends QueryEngineOptions {
 	}
 
 	/**
+	 * The number of {@link org.hibernate.stat.QueryStatistics} entries
+	 * that should be stored by {@link org.hibernate.stat.Statistics}.
+	 *
 	 * @see org.hibernate.cfg.StatisticsSettings#QUERY_STATISTICS_MAX_SIZE
 	 */
 	int getQueryStatisticsMaxSize();
 
 	/**
+	 * Should JPA entity lifecycle callbacks be processed by
+	 * the {@link org.hibernate.event.spi.EventEngine} and
+	 * {@link org.hibernate.jpa.event.spi.CallbackRegistry}?
+	 *
 	 * @see org.hibernate.cfg.PersistenceSettings#JPA_CALLBACKS_ENABLED
 	 */
 	boolean areJPACallbacksEnabled();
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/CallbacksFactory.java b/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/CallbacksFactory.java
index 1accf10ea8..3c0e0d5118 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/CallbacksFactory.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/event/internal/CallbacksFactory.java
@@ -23,8 +23,8 @@ import org.jboss.logging.Logger;
 
 /**
  * The intent of this class is to use a lighter implementation
- * when JPA callbacks are disabled via
- * {@link SessionFactoryOptions#areJPACallbacksEnabled()}
+ * when standard JPA entity lifecycle callbacks are disabled via
+ * {@link SessionFactoryOptions#areJPACallbacksEnabled()}.
  */
 public final class CallbacksFactory {
 	private static final Logger log = Logger.getLogger( CallbacksFactory.class );
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/event/spi/CallbackRegistry.java b/hibernate-core/src/main/java/org/hibernate/jpa/event/spi/CallbackRegistry.java
index ef92e27491..908e538dce 100644
--- a/hibernate-core/src/main/java/org/hibernate/jpa/event/spi/CallbackRegistry.java
+++ b/hibernate-core/src/main/java/org/hibernate/jpa/event/spi/CallbackRegistry.java
@@ -5,7 +5,7 @@
 package org.hibernate.jpa.event.spi;
 
 /**
- * Registry of Callbacks by entity and type
+ * Registry of JPA entity lifecycle callbacks by entity and type.
  *
  * @author Steve Ebersole
  */