diff --git a/SelfRegistration/src/org/labkey/selfregistration/SelfRegistrationModule.java b/SelfRegistration/src/org/labkey/selfregistration/SelfRegistrationModule.java
index 1cbdd395c..29cf71312 100644
--- a/SelfRegistration/src/org/labkey/selfregistration/SelfRegistrationModule.java
+++ b/SelfRegistration/src/org/labkey/selfregistration/SelfRegistrationModule.java
@@ -53,7 +53,7 @@ public Collection<String> getSummary(Container c)
     }
 
     @Override
-    public @NotNull Set<Class> getIntegrationTests()
+    public @NotNull Set<Class<?>> getIntegrationTests()
     {
         return PageFlowUtil.set(SelfRegistrationController.TestCase.class);
     }
diff --git a/WNPRC_EHR/src/org/labkey/wnprc_ehr/WNPRC_EHRModule.java b/WNPRC_EHR/src/org/labkey/wnprc_ehr/WNPRC_EHRModule.java
index 85a6d4ade..d6caf1205 100644
--- a/WNPRC_EHR/src/org/labkey/wnprc_ehr/WNPRC_EHRModule.java
+++ b/WNPRC_EHR/src/org/labkey/wnprc_ehr/WNPRC_EHRModule.java
@@ -202,6 +202,7 @@ protected void init() {
         registerPermissions();
     }
 
+        @Override
         @NotNull
         protected Collection<WebPartFactory> createWebPartFactories()
         {
@@ -546,8 +547,7 @@ public void versionUpdate(ModuleContext moduleContext) throws Exception
     }
 
     @Override
-    @NotNull
-    public Set<Class> getIntegrationTests()
+    public @NotNull Set<Class<?>> getIntegrationTests()
     {
         return new Reflections("org.labkey.wnprc_ehr").getSubTypesOf(Assert.class).stream()
                 .filter(c -> c.getSimpleName().endsWith("IntegrationTest"))
@@ -555,8 +555,7 @@ public Set<Class> getIntegrationTests()
     }
 
     @Override
-    @NotNull
-    public Set<Class> getUnitTests()
+    public @NotNull Set<Class<?>> getUnitTests()
     {
         return new Reflections("org.labkey.wnprc_ehr").getSubTypesOf(Assert.class).stream()
                 .filter(c -> c.getSimpleName().endsWith("UnitTest"))
diff --git a/WNPRC_EHR/src/org/labkey/wnprc_ehr/pages/husbandry/WaterCalendarWebPartFactory.java b/WNPRC_EHR/src/org/labkey/wnprc_ehr/pages/husbandry/WaterCalendarWebPartFactory.java
index 61c339b9c..f762e4d36 100644
--- a/WNPRC_EHR/src/org/labkey/wnprc_ehr/pages/husbandry/WaterCalendarWebPartFactory.java
+++ b/WNPRC_EHR/src/org/labkey/wnprc_ehr/pages/husbandry/WaterCalendarWebPartFactory.java
@@ -16,8 +16,8 @@ public class WaterCalendarWebPartFactory extends BaseWebPartFactory
     public WaterCalendarWebPartFactory(){super ("Water Calendar");}
 
     @Override
-    public WebPartView getWebPartView(@NotNull ViewContext portalCtx, @NotNull Portal.WebPart webpart){
-
+    public WebPartView<?> getWebPartView(@NotNull ViewContext portalCtx, @NotNull Portal.WebPart webpart)
+    {
         Map<String, String> props = webpart.getPropertyMap();
 
         String animalIds = webpart.getPropertyMap().get("animalIds");
@@ -32,7 +32,7 @@ public WebPartView getWebPartView(@NotNull ViewContext portalCtx, @NotNull Porta
             unBindJSON.put(unBindComponent);
         }
 
-        JspView view = new JspView("/org/labkey/wnprc_ehr/pages/husbandry/WaterCalendar.jsp");
+        JspView<?> view = new JspView<>("/org/labkey/wnprc_ehr/pages/husbandry/WaterCalendar.jsp");
         view.setTitle("Water Calendar");
         view.setFrame(WebPartView.FrameType.PORTAL);