diff --git a/core/src/main/java/org/infinispan/CacheImpl.java b/core/src/main/java/org/infinispan/CacheImpl.java
index 0bbe42a89b66..2628adb8363a 100644
--- a/core/src/main/java/org/infinispan/CacheImpl.java
+++ b/core/src/main/java/org/infinispan/CacheImpl.java
@@ -797,11 +797,11 @@ public String getCacheName() {
    }
 
    /**
-    * Returns the cache configuration as XML string.
+    * Returns the version of Infinispan.
     */
    @ManagedAttribute(
-         description = "Returns the cache configuration as XML string",
-         displayName = "Cache configuration (XML)",
+         description = "Returns the version of Infinispan",
+         displayName = "Infinispan version",
          dataType = DataType.TRAIT,
          displayType = DisplayType.SUMMARY
    )
diff --git a/core/src/main/java/org/infinispan/interceptors/CacheLoaderInterceptor.java b/core/src/main/java/org/infinispan/interceptors/CacheLoaderInterceptor.java
index e119c81bb205..aac357303324 100755
--- a/core/src/main/java/org/infinispan/interceptors/CacheLoaderInterceptor.java
+++ b/core/src/main/java/org/infinispan/interceptors/CacheLoaderInterceptor.java
@@ -429,8 +429,8 @@ public void resetStatistics() {
    }
 
    @ManagedAttribute(
-         description = "Returns a collection of cache loader types which configured and enabled",
-         displayName = "Returns a collection of cache loader types which configured and enabled",
+         description = "Returns a collection of cache loader types which are configured and enabled",
+         displayName = "Returns a collection of cache loader types which are configured and enabled",
          displayType = DisplayType.DETAIL)
    /**
     * This method returns a collection of cache loader types (fully qualified class names) that are configured and enabled.
diff --git a/core/src/main/java/org/infinispan/interceptors/InvalidationInterceptor.java b/core/src/main/java/org/infinispan/interceptors/InvalidationInterceptor.java
index dd885a4480f6..1d505d200091 100644
--- a/core/src/main/java/org/infinispan/interceptors/InvalidationInterceptor.java
+++ b/core/src/main/java/org/infinispan/interceptors/InvalidationInterceptor.java
@@ -249,6 +249,7 @@ public void resetStatistics() {
 
    @ManagedAttribute(
          displayName = "Statistics enabled",
+         description = "Enables or disables the gathering of statistics by this component",
          dataType = DataType.TRAIT,
          writable = true
    )
diff --git a/core/src/main/java/org/infinispan/manager/DefaultCacheManager.java b/core/src/main/java/org/infinispan/manager/DefaultCacheManager.java
index b07fa53fb6eb..94e642d821b6 100644
--- a/core/src/main/java/org/infinispan/manager/DefaultCacheManager.java
+++ b/core/src/main/java/org/infinispan/manager/DefaultCacheManager.java
@@ -731,9 +731,9 @@ public String getRunningCacheCount() {
       return String.valueOf(running);
    }
 
-   @ManagedAttribute(description = "Infinispan version.", displayName = "Infinispan version", displayType = DisplayType.SUMMARY, dataType = DataType.TRAIT)
+   @ManagedAttribute(description = "Returns the version of Infinispan", displayName = "Infinispan version", displayType = DisplayType.SUMMARY, dataType = DataType.TRAIT)
    public String getVersion() {
-      return Version.printVersion();
+      return Version.VERSION;
    }
 
    @ManagedAttribute(description = "The name of this cache manager", displayName = "Cache manager name", displayType = DisplayType.SUMMARY, dataType = DataType.TRAIT)
diff --git a/core/src/main/java/org/infinispan/remoting/rpc/RpcManagerImpl.java b/core/src/main/java/org/infinispan/remoting/rpc/RpcManagerImpl.java
index 9ade2118a303..a05a5826e3b8 100644
--- a/core/src/main/java/org/infinispan/remoting/rpc/RpcManagerImpl.java
+++ b/core/src/main/java/org/infinispan/remoting/rpc/RpcManagerImpl.java
@@ -363,7 +363,7 @@ public long getReplicationFailures() {
       return replicationFailures.get();
    }
 
-   @ManagedAttribute(description = "Statistics enabled", displayName = "Statistics enabled", dataType = DataType.TRAIT, writable = true)
+   @ManagedAttribute(description = "Enables or disables the gathering of statistics by this component", displayName = "Statistics enabled", dataType = DataType.TRAIT, writable = true)
    public boolean isStatisticsEnabled() {
       return statisticsEnabled;
    }
diff --git a/core/src/main/java/org/infinispan/util/concurrent/locks/DeadlockDetectingLockManager.java b/core/src/main/java/org/infinispan/util/concurrent/locks/DeadlockDetectingLockManager.java
index 234030f96751..a6c44d05158d 100644
--- a/core/src/main/java/org/infinispan/util/concurrent/locks/DeadlockDetectingLockManager.java
+++ b/core/src/main/java/org/infinispan/util/concurrent/locks/DeadlockDetectingLockManager.java
@@ -164,12 +164,12 @@ public void resetStatistics() {
       cannotRunDld.set(0);
    }
 
-   @ManagedAttribute(description = "Number of remote transaction that were roll backed due to deadlocks", displayName = "Number of remote transaction that were roll backed due to deadlocks", measurementType = MeasurementType.TRENDSUP)
+   @ManagedAttribute(description = "Number of remote transactions that were rollbacked due to deadlocks", displayName = "Number of remote transaction that were roll backed due to deadlocks", measurementType = MeasurementType.TRENDSUP)
    public long getDetectedRemoteDeadlocks() {
       return remoteTxStopped.get();
    }
 
-   @ManagedAttribute (description = "Number of local transaction that were roll backed due to deadlocks", displayName = "Number of local transaction that were roll backed due to deadlocks", measurementType = MeasurementType.TRENDSUP)
+   @ManagedAttribute (description = "Number of local transactions that were rollbacked due to deadlocks", displayName = "Number of local transaction that were roll backed due to deadlocks", measurementType = MeasurementType.TRENDSUP)
    public long getDetectedLocalDeadlocks() {
       return localTxStopped.get();
    }