diff --git a/api/server-server/leaving.yaml b/api/server-server/leaving.yaml
index c088cb5d..e0882fe8 100644
--- a/api/server-server/leaving.yaml
+++ b/api/server-server/leaving.yaml
@@ -57,7 +57,6 @@ paths:
             `room version specification`_ for precise event formats. **The response body
             here describes the common event fields in more detail and may be missing other
             required fields for a PDU.**
-          schema:
           schema:
             type: object
             properties:
diff --git a/api/server-server/query.yaml b/api/server-server/query.yaml
index dc14724c..29826b32 100644
--- a/api/server-server/query.yaml
+++ b/api/server-server/query.yaml
@@ -81,7 +81,7 @@ paths:
               servers:
                 type: array
                 description: |-
-                  An array of server names that are likely to hold the given room. This 
+                  An array of server names that are likely to hold the given room. This
                   list may or may not include the server answering the query.
                 items:
                   type: string
@@ -128,7 +128,7 @@ paths:
           x-example: "@someone:example.org"
         - in: query
           name: field
-          type: enum
+          type: string
           enum: ['displayname', 'avatar_url']
           description: |-
             The field to query. If specified, the server will only return the given field
@@ -139,7 +139,7 @@ paths:
           description: |-
             The profile for the user. If a ``field`` is specified in the request, only the
             matching field should be included in the response. If no ``field`` was specified,
-            the response should include the fields of the user's profile that can be made 
+            the response should include the fields of the user's profile that can be made
             public, such as the display name and avatar.
 
             If the user does not have a particular field set on their profile, the server
diff --git a/api/server-server/user_devices.yaml b/api/server-server/user_devices.yaml
index 4805deb4..362f9baa 100644
--- a/api/server-server/user_devices.yaml
+++ b/api/server-server/user_devices.yaml
@@ -42,7 +42,6 @@ paths:
           description: |-
             The user ID to retrieve devices for. Must be a user local to the
             receiving homeserver.
-          required: true
           x-example: "@alice:example.org"
       responses:
         200:
@@ -82,4 +81,4 @@ paths:
                       description: Optional display name for the device.
                       example: "Alice's Mobile Phone"
                   required: ['device_id', 'keys']
-            required: ['user_id', 'stream_id', 'devices']
\ No newline at end of file
+            required: ['user_id', 'stream_id', 'devices']
diff --git a/api/server-server/version.yaml b/api/server-server/version.yaml
index 19975529..929f7b91 100644
--- a/api/server-server/version.yaml
+++ b/api/server-server/version.yaml
@@ -27,6 +27,7 @@ paths:
     get:
       summary: Get the implementation name and version of this homeserver.
       description: Get the implementation name and version of this homeserver.
+      operationId: getVersion
       responses:
         200:
           description:
diff --git a/api/server-server/wellknown.yaml b/api/server-server/wellknown.yaml
index 75676646..bc390bd5 100644
--- a/api/server-server/wellknown.yaml
+++ b/api/server-server/wellknown.yaml
@@ -29,6 +29,7 @@ paths:
         Gets information about the delegated server for server-server communication
         between Matrix homeservers. Servers should follow 30x redirects, carefully
         avoiding redirect loops, and use normal X.509 certificate validation.
+      operationId: getWellKnown
       responses:
         200:
           description: