diff --git a/snprc_ehr/src/org/labkey/snprc_ehr/domain/NewAnimalData.java b/snprc_ehr/src/org/labkey/snprc_ehr/domain/NewAnimalData.java
index cb590940b..334c00e5b 100644
--- a/snprc_ehr/src/org/labkey/snprc_ehr/domain/NewAnimalData.java
+++ b/snprc_ehr/src/org/labkey/snprc_ehr/domain/NewAnimalData.java
@@ -220,25 +220,25 @@ public JSONObject toJSON(Container c, User u)
     @Nullable
     public String birthDateToString()
     {
-        return DateUtil.formatDateISO8601(getBirthDate());
+        return DateUtil.formatIsoDate(getBirthDate());
     }
 
     @Nullable
     public String acqDateToString()
     {
-        return DateUtil.formatDateISO8601(getAcqDate());
+        return DateUtil.formatIsoDate(getAcqDate());
     }
 
     @Nullable
     public String modifiedDateToString()
     {
-        return DateUtil.formatDateISO8601(getModified());
+        return DateUtil.formatIsoDate(getModified());
     }
 
     @Nullable
     public String createdDateToString()
     {
-        return DateUtil.formatDateISO8601(getCreated());
+        return DateUtil.formatIsoDate(getCreated());
     }
 
     public String getId()
diff --git a/snprc_ehr/src/org/labkey/snprc_ehr/notification/SSRSConfigManager.java b/snprc_ehr/src/org/labkey/snprc_ehr/notification/SSRSConfigManager.java
index fa843fdf6..9db02dfdf 100644
--- a/snprc_ehr/src/org/labkey/snprc_ehr/notification/SSRSConfigManager.java
+++ b/snprc_ehr/src/org/labkey/snprc_ehr/notification/SSRSConfigManager.java
@@ -20,6 +20,7 @@
 import org.jetbrains.annotations.Nullable;
 import org.labkey.api.data.Container;
 import org.labkey.api.data.PropertyManager;
+import org.labkey.api.data.PropertyManager.WritablePropertyMap;
 import org.labkey.api.data.PropertyStore;
 
 import java.net.MalformedURLException;
@@ -81,7 +82,7 @@ public void setProperties(@NotNull Container c, @Nullable String user, @Nullable
         new URL(baseURL);
 
         PropertyStore store = PropertyManager.getEncryptedStore();
-        PropertyManager.PropertyMap map = store.getWritableProperties(c, SSRS_PROPERTY_CATEGORY, true);
+        WritablePropertyMap map = store.getWritableProperties(c, SSRS_PROPERTY_CATEGORY, true);
         map.put(SSRS_USER_NAME_PROPERTY, user);
         map.put(SSRS_PASSWORD_PROPERTY, password);
         map.put(SSRS_BASE_URL, baseURL);
diff --git a/snprc_scheduler/src/org/labkey/snprc_scheduler/domains/Timeline.java b/snprc_scheduler/src/org/labkey/snprc_scheduler/domains/Timeline.java
index 0478bd711..6bc4e33ac 100644
--- a/snprc_scheduler/src/org/labkey/snprc_scheduler/domains/Timeline.java
+++ b/snprc_scheduler/src/org/labkey/snprc_scheduler/domains/Timeline.java
@@ -187,7 +187,7 @@ public Date getStartDate()
     public String startDateToString()
     {
 
-        return DateUtil.formatDateISO8601(getStartDate());
+        return DateUtil.formatIsoDate(getStartDate());
     }
 
     public void setStartDate(Date startDate)
@@ -204,7 +204,7 @@ public Date getEndDate()
     public String endDateToString()
     {
 
-        return DateUtil.formatDateISO8601(getEndDate());
+        return DateUtil.formatIsoDate(getEndDate());
     }
 
     public void setEndDate(Date endDate)
@@ -265,13 +265,13 @@ public void setCreated(Date created)
     @Nullable
     public String modifiedDateToString()
     {
-        return DateUtil.formatDateISO8601(getModified());
+        return DateUtil.formatIsoDate(getModified());
     }
 
     @Nullable
     public String createdDateToString()
     {
-        return DateUtil.formatDateISO8601(getCreated());
+        return DateUtil.formatIsoDate(getCreated());
     }
 
     public Date getModified()