diff --git a/source/java/org/alfresco/repo/template/VersionHistoryNode.java b/source/java/org/alfresco/repo/template/VersionHistoryNode.java
index 00e9f1208c..83d43a3825 100644
--- a/source/java/org/alfresco/repo/template/VersionHistoryNode.java
+++ b/source/java/org/alfresco/repo/template/VersionHistoryNode.java
@@ -203,6 +203,7 @@ public class VersionHistoryNode extends BaseContentNode
     /**
      * @return The list of aspects applied to this node
      */
+    @Override
     public Set<QName> getAspects()
     {
         if (this.aspects == null)
@@ -218,6 +219,7 @@ public class VersionHistoryNode extends BaseContentNode
      * 
      * @return true if the node has the aspect false otherwise
      */
+    @Override
     public boolean hasAspect(String aspect)
     {
         if (this.aspects == null)
@@ -247,6 +249,7 @@ public class VersionHistoryNode extends BaseContentNode
     /**
      * @see org.alfresco.repo.template.TemplateProperties#getChildren()
      */
+    @Override
     public List<TemplateProperties> getChildren()
     {
         return null;
diff --git a/source/java/org/alfresco/service/namespace/QName.java b/source/java/org/alfresco/service/namespace/QName.java
index 2deb59c045..6be0b85752 100644
--- a/source/java/org/alfresco/service/namespace/QName.java
+++ b/source/java/org/alfresco/service/namespace/QName.java
@@ -44,10 +44,10 @@ public final class QName implements QNamePattern, Serializable, Cloneable
 {
     private static final long serialVersionUID = 3977016258204348976L;
 
-    private String namespaceURI;                // never null
-    private String localName;                   // never null
+    private final String namespaceURI;                // never null
+    private final String localName;                   // never null
     private int hashCode;
-    private String prefix;
+    private final String prefix;
 
     public static final char NAMESPACE_PREFIX = ':';
     public static final char NAMESPACE_BEGIN = '{';
@@ -342,10 +342,10 @@ public final class QName implements QNamePattern, Serializable, Cloneable
      */
     public String toString()
     {
-        return new StringBuffer(80).append(NAMESPACE_BEGIN)
-                                   .append(namespaceURI)
-                                   .append(NAMESPACE_END)
-                                   .append(localName).toString();
+        return new StringBuilder(80).append(NAMESPACE_BEGIN)
+                                    .append(namespaceURI)
+                                    .append(NAMESPACE_END)
+                                    .append(localName).toString();
     }