diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalsBuilder.java b/core/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalsBuilder.java
index e69ba4f4d0b..2fa4476c0d9 100644
--- a/core/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalsBuilder.java
+++ b/core/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalsBuilder.java
@@ -37,6 +37,7 @@ import org.elasticsearch.indices.breaker.CircuitBreakerService;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.concurrent.TimeUnit;
 
 /**
  * Utility class to build global ordinals.
@@ -63,10 +64,10 @@ public enum GlobalOrdinalsBuilder {
 
         if (logger.isDebugEnabled()) {
             logger.debug(
-                    "Global-ordinals[{}][{}] took {} ms",
+                    "global-ordinals [{}][{}] took [{}]",
                     indexFieldData.getFieldName(),
                     ordinalMap.getValueCount(),
-                    TimeValue.nsecToMSec(System.nanoTime() - startTimeNS)
+                    new TimeValue(System.nanoTime() - startTimeNS, TimeUnit.NANOSECONDS)
             );
         }
         return new InternalGlobalOrdinalsIndexFieldData(indexSettings, indexFieldData.getFieldName(),
diff --git a/core/src/main/java/org/elasticsearch/index/fielddata/plain/ParentChildIndexFieldData.java b/core/src/main/java/org/elasticsearch/index/fielddata/plain/ParentChildIndexFieldData.java
index d0e2290c0a9..caeb92a7d44 100644
--- a/core/src/main/java/org/elasticsearch/index/fielddata/plain/ParentChildIndexFieldData.java
+++ b/core/src/main/java/org/elasticsearch/index/fielddata/plain/ParentChildIndexFieldData.java
@@ -209,7 +209,7 @@ public class ParentChildIndexFieldData extends AbstractIndexFieldData<AtomicPare
         breakerService.getBreaker(CircuitBreaker.FIELDDATA).addWithoutBreaking(ramBytesUsed);
         if (logger.isDebugEnabled()) {
             logger.debug(
-                    "Global-ordinals[_parent] took {}",
+                    "global-ordinals [_parent] took [{}]",
                     new TimeValue(System.nanoTime() - startTime, TimeUnit.NANOSECONDS)
             );
         }
diff --git a/core/src/main/java/org/elasticsearch/monitor/fs/FsService.java b/core/src/main/java/org/elasticsearch/monitor/fs/FsService.java
index 0287d5c522c..d21b660e774 100644
--- a/core/src/main/java/org/elasticsearch/monitor/fs/FsService.java
+++ b/core/src/main/java/org/elasticsearch/monitor/fs/FsService.java
@@ -46,7 +46,7 @@ public class FsService extends AbstractComponent {
         this.probe = new FsProbe(settings, nodeEnvironment);
         TimeValue refreshInterval = REFRESH_INTERVAL_SETTING.get(settings);
         fsStatsCache = new FsInfoCache(refreshInterval, probe.stats());
-        logger.debug("Using probe [{}] with refresh_interval [{}]", probe, refreshInterval);
+        logger.debug("using refresh_interval [{}]", refreshInterval);
     }
 
     public FsInfo stats() {
diff --git a/core/src/main/java/org/elasticsearch/monitor/jvm/JvmService.java b/core/src/main/java/org/elasticsearch/monitor/jvm/JvmService.java
index e91c05e75ac..78dcf13ae8b 100644
--- a/core/src/main/java/org/elasticsearch/monitor/jvm/JvmService.java
+++ b/core/src/main/java/org/elasticsearch/monitor/jvm/JvmService.java
@@ -47,7 +47,7 @@ public class JvmService extends AbstractComponent {
 
         this.refreshInterval = REFRESH_INTERVAL_SETTING.get(settings);
 
-        logger.debug("Using refresh_interval [{}]", refreshInterval);
+        logger.debug("using refresh_interval [{}]", refreshInterval);
     }
 
     public JvmInfo info() {
diff --git a/core/src/main/java/org/elasticsearch/monitor/os/OsService.java b/core/src/main/java/org/elasticsearch/monitor/os/OsService.java
index d452094d7b0..eb535141d83 100644
--- a/core/src/main/java/org/elasticsearch/monitor/os/OsService.java
+++ b/core/src/main/java/org/elasticsearch/monitor/os/OsService.java
@@ -53,7 +53,7 @@ public class OsService extends AbstractComponent {
         this.info.allocatedProcessors = EsExecutors.boundedNumberOfProcessors(settings);
 
         osStatsCache = new OsStatsCache(refreshInterval, probe.osStats());
-        logger.debug("Using probe [{}] with refresh_interval [{}]", probe, refreshInterval);
+        logger.debug("using refresh_interval [{}]", refreshInterval);
     }
 
     public OsInfo info() {
diff --git a/core/src/main/java/org/elasticsearch/monitor/process/ProcessService.java b/core/src/main/java/org/elasticsearch/monitor/process/ProcessService.java
index 30c24f34c66..dbab25037d9 100644
--- a/core/src/main/java/org/elasticsearch/monitor/process/ProcessService.java
+++ b/core/src/main/java/org/elasticsearch/monitor/process/ProcessService.java
@@ -47,7 +47,7 @@ public final class ProcessService extends AbstractComponent {
         processStatsCache = new ProcessStatsCache(refreshInterval, probe.processStats());
         this.info = probe.processInfo();
         this.info.refreshInterval = refreshInterval.millis();
-        logger.debug("Using probe [{}] with refresh_interval [{}]", probe, refreshInterval);
+        logger.debug("using refresh_interval [{}]", refreshInterval);
     }
 
     public ProcessInfo info() {