diff --git a/packages/frontend-core/src/components/grid/lib/websocket.js b/packages/frontend-core/src/components/grid/lib/websocket.js
index b0fd236989..e7b89ff58a 100644
--- a/packages/frontend-core/src/components/grid/lib/websocket.js
+++ b/packages/frontend-core/src/components/grid/lib/websocket.js
@@ -61,6 +61,15 @@ export const createGridWebsocket = context => {
       }
     }
   )
+  socket.on(
+    GridSocketEvent.DatasourceChange,
+    ({ datasource: newDatasource }) => {
+      // Listen builder renames, as these aren't handled otherwise
+      if (newDatasource?.name !== get(definition).name) {
+        definition.set(newDatasource)
+      }
+    }
+  )
 
   // Change websocket connection when table changes
   datasource.subscribe(connectToDatasource)
diff --git a/packages/server/specs/parameters.ts b/packages/server/specs/parameters.ts
index a4f2b27ae4..2726ca5064 100644
--- a/packages/server/specs/parameters.ts
+++ b/packages/server/specs/parameters.ts
@@ -24,7 +24,7 @@ export const appId = {
   required: true,
   description: "The ID of the app which this request is targeting.",
   schema: {
-    default: "{{ appId }}",
+    default: "{{appId}}",
     type: "string",
   },
 }
@@ -35,7 +35,7 @@ export const appIdUrl = {
   required: true,
   description: "The ID of the app which this request is targeting.",
   schema: {
-    default: "{{ appId }}",
+    default: "{{appId}}",
     type: "string",
   },
 }
diff --git a/packages/server/specs/resources/index.ts b/packages/server/specs/resources/index.ts
index c06148b7de..49508e2e4f 100644
--- a/packages/server/specs/resources/index.ts
+++ b/packages/server/specs/resources/index.ts
@@ -15,6 +15,7 @@ export const examples = {
   ...user.getExamples(),
   ...misc.getExamples(),
   ...metrics.getExamples(),
+  ...roles.getExamples(),
 }
 
 export const schemas = {
diff --git a/packages/server/src/api/routes/public/index.ts b/packages/server/src/api/routes/public/index.ts
index 36e0f74bee..b665e83f6f 100644
--- a/packages/server/src/api/routes/public/index.ts
+++ b/packages/server/src/api/routes/public/index.ts
@@ -4,6 +4,7 @@ import queryEndpoints from "./queries"
 import tableEndpoints from "./tables"
 import rowEndpoints from "./rows"
 import userEndpoints from "./users"
+import roleEndpoints from "./roles"
 import authorized from "../../../middleware/authorized"
 import publicApi from "../../../middleware/publicApi"
 import { paramResource, paramSubResource } from "../../../middleware/resourceId"
@@ -145,6 +146,7 @@ function applyRoutes(
 }
 
 applyAdminRoutes(metricEndpoints)
+applyAdminRoutes(roleEndpoints)
 applyRoutes(appEndpoints, PermissionType.APP, "appId")
 applyRoutes(tableEndpoints, PermissionType.TABLE, "tableId")
 applyRoutes(userEndpoints, PermissionType.USER, "userId")
diff --git a/packages/server/src/websockets/grid.ts b/packages/server/src/websockets/grid.ts
index a36413454e..3911313cc3 100644
--- a/packages/server/src/websockets/grid.ts
+++ b/packages/server/src/websockets/grid.ts
@@ -80,7 +80,8 @@ export default class GridSocket extends BaseSocket {
   }
 
   emitRowUpdate(ctx: any, row: Row) {
-    const resourceId = ctx.params?.viewId || getSourceId(ctx)
+    const source = getSourceId(ctx)
+    const resourceId = source.viewId ?? source.tableId
     const room = `${ctx.appId}-${resourceId}`
     this.emitToRoom(ctx, room, GridSocketEvent.RowChange, {
       id: row._id,
@@ -89,7 +90,8 @@ export default class GridSocket extends BaseSocket {
   }
 
   emitRowDeletion(ctx: any, row: Row) {
-    const resourceId = ctx.params?.viewId || getSourceId(ctx)
+    const source = getSourceId(ctx)
+    const resourceId = source.viewId ?? source.tableId
     const room = `${ctx.appId}-${resourceId}`
     this.emitToRoom(ctx, room, GridSocketEvent.RowChange, {
       id: row._id,