diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestGroupsModel.java b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestGroupsModel.java
index c5b7b7c1dd..c126ac72cf 100644
--- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestGroupsModel.java
+++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/model/RestGroupsModel.java
@@ -42,7 +42,7 @@ public class RestGroupsModel extends TestModel implements IRestModel<RestGroupsM
     private String description;
     @JsonProperty(required = true)
     private Boolean isRoot;
-    @JsonProperty(required = true)
+    @JsonProperty()
     private Boolean hasSubgroups;
 
     @JsonProperty("parentIds")
diff --git a/repository/src/main/java/org/alfresco/repo/security/authority/AuthorityDAOImpl.java b/repository/src/main/java/org/alfresco/repo/security/authority/AuthorityDAOImpl.java
index 085bcca96a..6db71ea26b 100644
--- a/repository/src/main/java/org/alfresco/repo/security/authority/AuthorityDAOImpl.java
+++ b/repository/src/main/java/org/alfresco/repo/security/authority/AuthorityDAOImpl.java
@@ -1444,6 +1444,7 @@ public class AuthorityDAOImpl implements AuthorityDAO, NodeServicePolicies.Befor
         nodeService.setProperty(ref, ContentModel.PROP_AUTHORITY_DISPLAY_NAME, authorityDisplayName);
     }
 
+    @Override
     public Pair<String, String> getAuthorityDisplayNameAndDescription(String authorityName)
     {
         NodeRef ref = getAuthorityOrNull(authorityName);
@@ -1456,6 +1457,7 @@ public class AuthorityDAOImpl implements AuthorityDAO, NodeServicePolicies.Befor
         return new Pair<>(DefaultTypeConverter.INSTANCE.convert(String.class, displayName), DefaultTypeConverter.INSTANCE.convert(String.class, description));
     }
 
+    @Override
     public void setAuthorityDisplayNameAndDescription(String authorityName, String authorityDisplayName, String description)
     {
         NodeRef ref = getAuthorityOrNull(authorityName);
diff --git a/repository/src/main/java/org/alfresco/repo/security/authority/AuthorityServiceImpl.java b/repository/src/main/java/org/alfresco/repo/security/authority/AuthorityServiceImpl.java
index 7923bcffe4..103e76888c 100644
--- a/repository/src/main/java/org/alfresco/repo/security/authority/AuthorityServiceImpl.java
+++ b/repository/src/main/java/org/alfresco/repo/security/authority/AuthorityServiceImpl.java
@@ -700,6 +700,7 @@ public class AuthorityServiceImpl implements AuthorityService, InitializingBean
     /**
      * {@inheritDoc}
      */
+    @Override
     public Pair<String, String> getAuthorityDisplayNameAndDescription(String name)
     {
         Pair<String, String> displayNameAndDescription = authorityDAO.getAuthorityDisplayNameAndDescription(name);
@@ -713,6 +714,7 @@ public class AuthorityServiceImpl implements AuthorityService, InitializingBean
     /**
      * {@inheritDoc}
      */
+    @Override
     public void setAuthorityDisplayNameAndDescription(String authorityName, String authorityDisplayName, String description)
     {
         AuthorityType type = AuthorityType.getAuthorityType(authorityName);
diff --git a/repository/src/test/java/org/alfresco/repo/security/authority/AuthorityServiceTest.java b/repository/src/test/java/org/alfresco/repo/security/authority/AuthorityServiceTest.java
index eb4753b0f9..956d8587fd 100644
--- a/repository/src/test/java/org/alfresco/repo/security/authority/AuthorityServiceTest.java
+++ b/repository/src/test/java/org/alfresco/repo/security/authority/AuthorityServiceTest.java
@@ -1433,6 +1433,7 @@ public class AuthorityServiceTest extends TestCase
         assertEquals(pubAuthorityService.getAuthorityDisplayName("Monkey"), "Monkey");
     }
 
+    @Test
     public void testAuthorityDisplayNameAndDescription()
     {
         Map<QName, Serializable> props = new HashMap<>();