diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/mapper/StatsSources.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/mapper/StatsSources.java
index fc265d0223f6..c829bc5e9e6c 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/plan/mapper/StatsSources.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/mapper/StatsSources.java
@@ -85,8 +85,8 @@ private static ImmutableList<PersistedRuntimeStats> extractStatsFromPlanMapper(P
       List<RelTreeSignature> rSig = e.getAll(RelTreeSignature.class);
 
       if (stat.size() > 1 || sig.size() > 1) {
-        StringBuffer sb = new StringBuffer();
-        sb.append(String.format("expected(stat-sig) 1-1, got {}-{} ;", stat.size(), sig.size()));
+        StringBuilder sb = new StringBuilder();
+        sb.append(String.format("expected(stat-sig) 1-1, got %d-%d ;", stat.size(), sig.size()));
         for (OperatorStats s : stat) {
           sb.append(s);
           sb.append(";");
diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java
index f3fd213a162f..581e853a4187 100644
--- a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java
+++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java
@@ -14191,7 +14191,7 @@ private void processScheduledQueryPolicies(ScheduledQueryProgressInfo info) thro
         execution.setStartTime(now);
         execution.setEndTime(now);
         execution.setLastUpdateTime(now);
-        execution.setErrorMessage(String.format("Disabling query after {} consequtive failures", autoDisableCount));
+        execution.setErrorMessage(String.format("Disabling query after %d consecutive failures", autoDisableCount));
         pm.makePersistent(execution);
       }
       if (skipCount > 0) {
diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MScheduledExecution.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MScheduledExecution.java
index bd1b5141b69c..6c543a94d355 100644
--- a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MScheduledExecution.java
+++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MScheduledExecution.java
@@ -39,7 +39,7 @@ public MScheduledExecution() {
 
   @Override
   public String toString() {
-    return String.format("state: %s, scheduledQuery: %s, execId: %d", state, scheduledQuery.getScheduleName(),
+    return String.format("state: %s, scheduledQuery: %s, execId: %s", state, scheduledQuery.getScheduleName(),
         executorQueryId);
   }