diff --git a/hivrc/src/org/labkey/hivrc/HivrcModule.java b/hivrc/src/org/labkey/hivrc/HivrcModule.java
index d5a945e4..a60ac42d 100644
--- a/hivrc/src/org/labkey/hivrc/HivrcModule.java
+++ b/hivrc/src/org/labkey/hivrc/HivrcModule.java
@@ -4,10 +4,6 @@
 import org.jetbrains.annotations.Nullable;
 import org.labkey.api.data.Container;
 import org.labkey.api.ldk.ExtendedSimpleModule;
-import org.labkey.api.module.Module;
-import org.labkey.api.module.ModuleContext;
-import org.labkey.api.query.DefaultSchema;
-import org.labkey.api.query.QuerySchema;
 import org.labkey.api.util.HtmlString;
 import org.labkey.api.view.BaseWebPartFactory;
 import org.labkey.api.view.HtmlView;
@@ -53,7 +49,7 @@ protected Collection<WebPartFactory> createWebPartFactories()
                 new BaseWebPartFactory("HIVRC Analysis Header")
                 {
                     @Override
-                    public WebPartView getWebPartView(@NotNull ViewContext portalCtx, @NotNull Portal.WebPart webPart)
+                    public WebPartView<?> getWebPartView(@NotNull ViewContext portalCtx, @NotNull Portal.WebPart webPart)
                     {
                         if (!portalCtx.getContainer().isWorkbook())
                         {
diff --git a/mGAP/src/org/labkey/mgap/mGAPModule.java b/mGAP/src/org/labkey/mgap/mGAPModule.java
index 9375e0a7..8ba8ba93 100644
--- a/mGAP/src/org/labkey/mgap/mGAPModule.java
+++ b/mGAP/src/org/labkey/mgap/mGAPModule.java
@@ -208,7 +208,7 @@ public JSONObject getPageContextJson(ContainerUser context)
     }
 
     @Override
-    public @NotNull Set<Class> getUnitTests()
+    public @NotNull Set<Class<?>> getUnitTests()
     {
         return PageFlowUtil.set(mGapReleaseGenerator.TestCase.class);
     }
diff --git a/mGAP/src/org/labkey/mgap/mGapAuditTypeProvider.java b/mGAP/src/org/labkey/mgap/mGapAuditTypeProvider.java
index 95249756..dd3fca55 100644
--- a/mGAP/src/org/labkey/mgap/mGapAuditTypeProvider.java
+++ b/mGAP/src/org/labkey/mgap/mGapAuditTypeProvider.java
@@ -29,13 +29,7 @@ public class mGapAuditTypeProvider extends AbstractAuditTypeProvider implements
 
     public mGapAuditTypeProvider()
     {
-        
-    }
-
-    @Override
-    protected AbstractAuditDomainKind getDomainKind()
-    {
-        return new mGapAuditTypeProvider.AuditDomainKind();
+        super(new mGapAuditTypeProvider.AuditDomainKind());
     }
 
     @Override
diff --git a/primeseq/src/org/labkey/primeseq/PrimeseqModule.java b/primeseq/src/org/labkey/primeseq/PrimeseqModule.java
index 7bf969e3..f42984c7 100644
--- a/primeseq/src/org/labkey/primeseq/PrimeseqModule.java
+++ b/primeseq/src/org/labkey/primeseq/PrimeseqModule.java
@@ -125,7 +125,7 @@ public PipelineStartup()
     }
 
     @Override
-    public @NotNull Set<Class> getUnitTests()
+    public @NotNull Set<Class<?>> getUnitTests()
     {
         return PageFlowUtil.set(ClusterMaintenanceTask.TestCase.class);
     }