diff --git a/DBUtils/src/org/labkey/dbutils/jooq/RecordListener.java b/DBUtils/src/org/labkey/dbutils/jooq/RecordListener.java
index e8e6c8c73..8269f317c 100644
--- a/DBUtils/src/org/labkey/dbutils/jooq/RecordListener.java
+++ b/DBUtils/src/org/labkey/dbutils/jooq/RecordListener.java
@@ -139,11 +139,11 @@ else if (context.type().equals(ExecuteType.WRITE)) {
     }
 
     private void insertAuditMessageForRecord(OpType opType, Record record) {
-        QueryUpdateAuditProvider.QueryUpdateAuditEvent event = new QueryUpdateAuditProvider.QueryUpdateAuditEvent(container.getId(), opType.getMessage());
+        QueryUpdateAuditProvider.QueryUpdateAuditEvent event = new QueryUpdateAuditProvider.QueryUpdateAuditEvent(container, opType.getMessage());
 
-        if (record instanceof TableRecord) {
-            String schemaName = ((TableRecord) record).getTable().getSchema().getName();
-            String queryName  = ((TableRecord) record).getTable().getName();
+        if (record instanceof TableRecord<?> tableRecord) {
+            String schemaName = tableRecord.getTable().getSchema().getName();
+            String queryName  = tableRecord.getTable().getName();
 
             event.setSchemaName(schemaName);
             event.setQueryName(queryName);