diff --git a/cadc-access-control-identity/src/main/java/ca/nrc/cadc/auth/ACIdentityManager.java b/cadc-access-control-identity/src/main/java/ca/nrc/cadc/auth/ACIdentityManager.java
index cb0adaf1ba7ba4cab8db04a7a94d39d44588a72f..6f83d5d11630d017ef21e1fc5a52a469f42e56e0 100644
--- a/cadc-access-control-identity/src/main/java/ca/nrc/cadc/auth/ACIdentityManager.java
+++ b/cadc-access-control-identity/src/main/java/ca/nrc/cadc/auth/ACIdentityManager.java
@@ -227,7 +227,7 @@ public class ACIdentityManager implements IdentityManager
     /**
      * The returned CheckResource is the same as the one from AuthenticatorImpl.
      *
-     * @return
+     * @return the CheckResource
      */
     public static CheckResource getAvailabilityCheck()
     {
diff --git a/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/GroupPersistence.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/GroupPersistence.java
index ce1839d2ed007059fa20df47b232c6e9eb68ffa0..c6c8a3ef8e8144053c945f6061156dbde013e857 100755
--- a/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/GroupPersistence.java
+++ b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/GroupPersistence.java
@@ -158,7 +158,6 @@ public interface GroupPersistence
     /**
      * Obtain a Collection of Groups that fit the given query.
      *
-     * @param userID The userID.
      * @param role Role of the user, either owner, member, or read/write.
      * @param groupID The Group ID.
      *
diff --git a/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java
index 30897950e64ffc64411b1dee095d79cfe513af5d..d615643e73868060aa1da8efed0b02c18ea777aa 100755
--- a/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java
+++ b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java
@@ -161,7 +161,6 @@ public class LdapGroupDAO extends LdapDAO
      * Persists a group.
      *
      * @param group The group to create
-     * @return created group
      * @throws GroupAlreadyExistsException If a group with the same ID already
      *                                     exists.
      * @throws TransientException          If an temporary, unexpected problem occurred.
@@ -791,7 +790,7 @@ public class LdapGroupDAO extends LdapDAO
 
     /**
      * @param groupID
-     * @return
+     * @return the Distinguished Name of the group
      */
     protected DN getGroupDN(final String groupID) throws TransientException
     {
@@ -809,7 +808,7 @@ public class LdapGroupDAO extends LdapDAO
 
     /**
      * @param groupID
-     * @return
+     * @return the Distinguished Name of the admin group
      */
     protected DN getAdminGroupDN(final String groupID) throws TransientException
     {
diff --git a/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapGroupPersistence.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapGroupPersistence.java
index 8ce149e9336cb9e5833c5968398a85b802330231..2871975b0e4ccf0a7650fa8857f561c3d7bfdeda 100755
--- a/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapGroupPersistence.java
+++ b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapGroupPersistence.java
@@ -254,7 +254,7 @@ public class LdapGroupPersistence extends LdapPersistence implements GroupPersis
      *
      * @param role
      * @param groupID check membership in a specific group or null to get all groups
-     * @return
+     * @return the groups
      * @throws UserNotFoundException
      * @throws GroupNotFoundException
      * @throws TransientException
diff --git a/cadc-access-control/src/main/java/ca/nrc/cadc/ac/PosixDetails.java b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/PosixDetails.java
index bc068919680f539c24ba2b79b5c5c594dc1d7952..0360dce7de5c9ad94274e027378533e47460f68e 100644
--- a/cadc-access-control/src/main/java/ca/nrc/cadc/ac/PosixDetails.java
+++ b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/PosixDetails.java
@@ -84,7 +84,7 @@ public class PosixDetails
     public String loginShell;
 
     /**
-     * @param userName user name
+     * @param username user name
      * @param uid posix uid
      * @param gid posix gid
      * @param homeDirectory home directory
diff --git a/cadc-access-control/src/main/java/ca/nrc/cadc/ac/User.java b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/User.java
index 607af355616f2134b3245dbcaad5059ed8f30a5a..4caab97804b6751b07fd9bba23b5556f5016c5a3 100644
--- a/cadc-access-control/src/main/java/ca/nrc/cadc/ac/User.java
+++ b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/User.java
@@ -168,7 +168,7 @@ public class User
      * of this Users set of identities.
      *
      * @param superset
-     * @return
+     * @return true if the user is consistent, false otherwise
      */
     public boolean isConsistent(final User superset)
     {
diff --git a/cadc-access-control/src/main/java/ca/nrc/cadc/ac/client/GMSClient.java b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/client/GMSClient.java
index f8c72e7b342d44ccec2fa869c3a0098e782672a3..dda5da8a34046236fdc644e06e3d58bad4e83a15 100755
--- a/cadc-access-control/src/main/java/ca/nrc/cadc/ac/client/GMSClient.java
+++ b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/client/GMSClient.java
@@ -76,7 +76,6 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.net.URL;
 import java.security.AccessControlContext;
 import java.security.AccessControlException;
@@ -999,7 +998,7 @@ public class GMSClient implements TransferListener
      * Check group membership of the current Subject.
      *
      * @param groupName
-     * @return
+     * @return true if the current Subject is a member of the group, false otherwise
      * @throws UserNotFoundException
      * @throws AccessControlException
      * @throws IOException
@@ -1014,7 +1013,7 @@ public class GMSClient implements TransferListener
      *
      * @param groupName
      * @param role
-     * @return
+     * @return true if the current Subject is a member of the group with the specified role, false otherwise
      * @throws UserNotFoundException
      * @throws AccessControlException
      * @throws IOException