diff --git a/solr/core/src/java/org/apache/solr/update/processor/NumFieldLimitingUpdateRequestProcessor.java b/solr/core/src/java/org/apache/solr/update/processor/NumFieldLimitingUpdateRequestProcessor.java
index 758eb4dcab4..3865bf28443 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/NumFieldLimitingUpdateRequestProcessor.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/NumFieldLimitingUpdateRequestProcessor.java
@@ -59,7 +59,7 @@ public void processAdd(AddUpdateCommand cmd) throws IOException {
       } else {
         if (log.isDebugEnabled()) {
           log.debug(
-              "Allowing document {}, since current core is under the max-field limit (numFields={}, maxThreshold={})",
+              "Allowing document {}, since current core is under the 'maxFields' limit (numFields={}, maxFields={})",
               cmd.getPrintableId(),
               currentNumFields,
               fieldThreshold);
diff --git a/solr/core/src/java/org/apache/solr/update/processor/NumFieldsMonitor.java b/solr/core/src/java/org/apache/solr/update/processor/NumFieldsMonitor.java
index e7519172306..3210b6f20ed 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/NumFieldsMonitor.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/NumFieldsMonitor.java
@@ -36,8 +36,7 @@ public void postCommit() {
     try {
       indexSearcher = getCore().getSearcher();
       // Get the number of fields directly from the IndexReader instead of the Schema object to also
-      // include the
-      // fields that are missing from the Schema file (dynamic/deleted etc.)
+      // include the fields that are missing from the Schema file (dynamic/deleted etc.)
       numFields = indexSearcher.get().getFieldInfos().size();
     } finally {
       if (indexSearcher != null) {
diff --git a/solr/core/src/test-files/solr/configsets/cloud-minimal-field-limiting/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/cloud-minimal-field-limiting/conf/solrconfig.xml
index dd12e063088..98bd3622a58 100644
--- a/solr/core/src/test-files/solr/configsets/cloud-minimal-field-limiting/conf/solrconfig.xml
+++ b/solr/core/src/test-files/solr/configsets/cloud-minimal-field-limiting/conf/solrconfig.xml
@@ -68,6 +68,6 @@
 
   <indexConfig>
     <mergeScheduler class="${solr.mscheduler:org.apache.lucene.index.ConcurrentMergeScheduler}"/>
-:  </indexConfig>
+  </indexConfig>
 </config>
 
diff --git a/solr/core/src/test/org/apache/solr/update/processor/NumFieldLimitingUpdateRequestProcessorIntegrationTest.java b/solr/core/src/test/org/apache/solr/update/processor/NumFieldLimitingUpdateRequestProcessorIntegrationTest.java
index b26787852e2..3c02796bceb 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/NumFieldLimitingUpdateRequestProcessorIntegrationTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/NumFieldLimitingUpdateRequestProcessorIntegrationTest.java
@@ -29,7 +29,6 @@
 
 public class NumFieldLimitingUpdateRequestProcessorIntegrationTest extends SolrCloudTestCase {
 
-  private static long ADMIN_OPERATION_TIMEOUT = 15 * 1000;
   private static String SINGLE_SHARD_COLL_NAME = "singleShardColl";
   private static String FIELD_LIMITING_CS_NAME = "fieldLimitingConfig";
 
diff --git a/solr/server/solr/configsets/_default/conf/solrconfig.xml b/solr/server/solr/configsets/_default/conf/solrconfig.xml
index 9807a5150c6..e04a4cb9a9b 100644
--- a/solr/server/solr/configsets/_default/conf/solrconfig.xml
+++ b/solr/server/solr/configsets/_default/conf/solrconfig.xml
@@ -939,7 +939,7 @@
   </updateProcessor>
 
   <!-- The update.autoCreateFields property can be turned to false to disable schemaless mode -->
-  <updateRequestProcessorChain name="add-unknown-fields-to-the-schema" default="true"
+  <updateRequestProcessorChain name="add-unknown-fields-to-the-schema" default="${update.autoCreateFields:true}"
            processor="uuid,remove-blank,field-name-mutating,parse-boolean,parse-long,parse-double,parse-date,add-schema-fields">
     <processor class="solr.LogUpdateProcessorFactory"/>
     <processor class="solr.DistributedUpdateProcessorFactory"/>