diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java
index b0798e7a77..ed835574f8 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java
@@ -652,7 +652,7 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService,
 
                 String zone = getZoneName(rmRootNode);
                 Set<String> roles = authorityService.getAllAuthoritiesInZone(zone, AuthorityType.GROUP);
-                return new Boolean(roles.contains(fullRoleName));
+                return Boolean.valueOf(roles.contains(fullRoleName));
             }
         }, AuthenticationUtil.getSystemUserName()).booleanValue();
     }
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/DataSetsGet.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/DataSetsGet.java
index 2e24f10df7..2c76cbd863 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/DataSetsGet.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/DataSetsGet.java
@@ -33,7 +33,7 @@ public class DataSetsGet extends DeclarativeWebScript
 
    /**
     * Set data set service
-    * 
+    *
     * @param dataSetService the data set service
     */
    public void setDataSetService(DataSetService dataSetService)
@@ -43,7 +43,7 @@ public class DataSetsGet extends DeclarativeWebScript
 
    /**
     * Set site service
-    * 
+    *
     * @param siteService the site service
     */
    public void setSiteService(SiteService siteService)
@@ -72,10 +72,10 @@ public class DataSetsGet extends DeclarativeWebScript
       boolean unloadedOnly = false;
       if (StringUtils.isNotBlank(unloadedOnlyParam))
       {
-         unloadedOnly = new Boolean(unloadedOnlyParam).booleanValue();
+         unloadedOnly = Boolean.valueOf(unloadedOnlyParam).booleanValue();
       }
 
-      // Get the loaded/unloaded data sets depending on the "unloadedOnly" parameter 
+      // Get the loaded/unloaded data sets depending on the "unloadedOnly" parameter
       Map<String, DataSet> dataSets = dataSetService.getDataSets(filePlan, unloadedOnly);
       List<Map<String, String>> dataSetList = new ArrayList<Map<String, String>>(dataSets.size());