diff --git a/.travis.yml b/.travis.yml
index a74206b8f93e613a58ca1fee685b95824ae05cda..0f37ad6c4cd153fd6fac52afa48bcc7293e07a54 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,5 +2,5 @@ language: java
 jdk:
   - openjdk7
   - oraclejdk8
-script: for mod in cadc-access-control  cadc-access-control-identity  cadc-access-control-server cadc-access-control-admin cadc-tomcat; do cd $mod; gradle assemble check install || break -1; cd ..; done
+script: for mod in cadc-access-control  cadc-access-control-identity  cadc-access-control-server cadc-access-control-admin cadc-tomcat; do cd $mod; gradle --info build javadoc install || break -1; cd ..; done
 
diff --git a/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/ModifyPasswordServlet.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/ModifyPasswordServlet.java
index 90d54ebbe421db5bd8d42296e399156601eed8b2..9ea050d873e854a6964e6b011566a064e96e3a83 100644
--- a/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/ModifyPasswordServlet.java
+++ b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/ModifyPasswordServlet.java
@@ -95,7 +95,7 @@ import ca.nrc.cadc.util.StringUtil;
  * Servlet to handle password changes.  Passwords are an integral part of the
  * access control system and are handled differently to accommodate stricter
  * guidelines.
- * <p/>
+ * <p>
  * This servlet handles POST only.  It relies on the Subject being set higher
  * up by the AccessControlFilter as configured in the web descriptor.
  */
diff --git a/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/ResetPasswordServlet.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/ResetPasswordServlet.java
index 2d261a1993c6d04979064d95a4895d9d48d624f8..2ba87dfb17a91686965c2eb21bd745c02c9a8107 100644
--- a/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/ResetPasswordServlet.java
+++ b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/ResetPasswordServlet.java
@@ -109,7 +109,7 @@ import ca.nrc.cadc.util.StringUtil;
  * Servlet to handle password resets.  Passwords are an integral part of the
  * access control system and are handled differently to accommodate stricter
  * guidelines.
- * <p/>
+ * <p>
  * This servlet handles GET and POST only.  It relies on the Subject being set higher
  * up by the AccessControlFilter as configured in the web descriptor.
  */
diff --git a/cadc-access-control/src/main/java/ca/nrc/cadc/ac/xml/GroupReader.java b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/xml/GroupReader.java
index 44fc31fff9ee973c0e17ac6093d93ee19dbf820d..8b2a35574eb7524f084d068f50cc3b4401acff2c 100755
--- a/cadc-access-control/src/main/java/ca/nrc/cadc/ac/xml/GroupReader.java
+++ b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/xml/GroupReader.java
@@ -115,7 +115,6 @@ public class GroupReader extends AbstractReaderWriter
      * @return Group Group.
      * @throws ReaderException
      * @throws java.io.IOException
-     * @throws java.net.URISyntaxException
      */
     public Group read(InputStream in)
         throws ReaderException, IOException
@@ -143,7 +142,6 @@ public class GroupReader extends AbstractReaderWriter
      * @return Group Group.
      * @throws ReaderException
      * @throws java.io.IOException
-     * @throws java.net.URISyntaxException
      */
     public Group read(Reader reader)
         throws ReaderException, IOException
diff --git a/cadc-access-control/src/main/java/ca/nrc/cadc/ac/xml/UserListReader.java b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/xml/UserListReader.java
index d78e94d67ee9c6e78f9e7d62c437f45e66019fda..fa69cf98af3c6b78e886625c8ae2419adf21c28f 100644
--- a/cadc-access-control/src/main/java/ca/nrc/cadc/ac/xml/UserListReader.java
+++ b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/xml/UserListReader.java
@@ -117,7 +117,6 @@ public class UserListReader extends AbstractReaderWriter
      * @return List of Users.
      * @throws ReaderException
      * @throws java.io.IOException
-     * @throws java.net.URISyntaxException
      */
     public List<User> read(InputStream in)
         throws ReaderException, IOException
diff --git a/cadc-tomcat/src/main/java/ca/nrc/cadc/tomcat/AuthenticationLookup.java b/cadc-tomcat/src/main/java/ca/nrc/cadc/tomcat/AuthenticationLookup.java
index c8d7a1b109fcb6a5c0cc200229c32aa072cbd088..d9959281c2f42b06a5ca15fb1f42705ca0893528 100644
--- a/cadc-tomcat/src/main/java/ca/nrc/cadc/tomcat/AuthenticationLookup.java
+++ b/cadc-tomcat/src/main/java/ca/nrc/cadc/tomcat/AuthenticationLookup.java
@@ -80,17 +80,17 @@ import org.apache.log4j.Logger;
 /**
  * A very simple caching IVOA Registry client. All the lookups done by this client use a properties
  * file named RegistryClient.properties found via the classpath.
- * </p><p>
+ * <p><p>
  * Note for developers: You can set a system property to force this class to replace the hostname
  * in the resuting URL with the canonical hostname of the local host. This is useful for testing:
- * </p>
+ * <p>
  * <pre>
  * ca.nrc.cadc.reg.client.RegistryClient.local=true
  * </pre>
- * </p><p>
+ * <p><p>
  * Note for developers: You can set a system property to force this class to replace the hostname
  * in the resuting URL with an arbitrary hostname. This is useful for testing a specific remote server:
- * </p>
+ * <p>
  * <pre>
  * ca.nrc.cadc.reg.client.RegistryClient.host=www.example.com
  * </pre>