diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/SecurityClearance.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/SecurityClearance.java
index 55d7d8779e..83eab84c3d 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/SecurityClearance.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/SecurityClearance.java
@@ -31,6 +31,8 @@ import java.util.Objects;
  */
 public final class SecurityClearance implements Serializable
 {
+    /** Serial version uid */
+    private static final long serialVersionUID = 8410664575120817707L;
     private final PersonInfo          personInfo;
     private final ClassificationLevel classificationLevel;
 
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/SecurityClearanceService.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/SecurityClearanceService.java
index acdc467bb5..367c0b56d5 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/SecurityClearanceService.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/SecurityClearanceService.java
@@ -18,7 +18,6 @@
  */
 package org.alfresco.module.org_alfresco_module_rm.classification;
 
-import org.alfresco.query.PagingRequest;
 import org.alfresco.query.PagingResults;
 import org.alfresco.service.cmr.security.NoSuchPersonException;
 
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/UserQueryParams.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/UserQueryParams.java
index 46a20531f5..8753859cec 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/UserQueryParams.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/UserQueryParams.java
@@ -76,6 +76,7 @@ public final class UserQueryParams
     }
 
     /** Sets the sort properties required for the query. */
+    @SuppressWarnings("unchecked")
     public UserQueryParams withSortProps(Pair<QName, Boolean> firstSortProp, Pair<QName, Boolean>... otherSortProps)
     {
         this.sortProps = Collections.unmodifiableList(toList(firstSortProp, otherSortProps));
@@ -89,6 +90,7 @@ public final class UserQueryParams
     public int                        getMaxItems()    { return this.maxItems; }
 
     /** Helper method to turn a varargs into a List, ensuring at least one element is present. */
+    @SuppressWarnings("unchecked")
     private <T> List<T> toList(T firstElem, T... otherElems)
     {
         // At least one element is required.