diff --git a/apis/cf/latest/components/responses/BadRequest.yaml b/apis/cf/latest/components/responses/BadRequest.yaml
index 2023489..c58bb36 100644
--- a/apis/cf/latest/components/responses/BadRequest.yaml
+++ b/apis/cf/latest/components/responses/BadRequest.yaml
@@ -3,3 +3,6 @@ content:
   application/json:
     schema:
       $ref: '../schemas/Errors.yaml'
+  text/html:
+    schema:
+      type: string
diff --git a/apis/cf/latest/components/schemas/ServiceBroker.yaml b/apis/cf/latest/components/schemas/ServiceBroker.yaml
index 3a7e491..0ec9e62 100644
--- a/apis/cf/latest/components/schemas/ServiceBroker.yaml
+++ b/apis/cf/latest/components/schemas/ServiceBroker.yaml
@@ -19,16 +19,6 @@ properties:
     type: string
     format: uri
     description: URL of the service broker
-  available:
-    type: boolean
-    description: Whether the service broker is available
-  status:
-    type: string
-    description: Status of the service broker
-    enum:
-      - available
-      - synchronization in progress
-      - synchronization failed
   relationships:
     type: object
     properties:
@@ -52,6 +42,4 @@ required:
   - updated_at
   - name
   - url
-  - available
-  - status
   - links
diff --git a/apis/cf/latest/paths/Buildpacks.yaml b/apis/cf/latest/paths/Buildpacks.yaml
index 9f63cab..1e00d5e 100644
--- a/apis/cf/latest/paths/Buildpacks.yaml
+++ b/apis/cf/latest/paths/Buildpacks.yaml
@@ -114,8 +114,15 @@
     parameters:
       - $ref: '../components/parameters/Guid.yaml'
     responses:
-      '204':
-        description: Successfully deleted buildpack
+      '202':
+        description: Accepted
+        headers:
+          Location:
+            description: URL of the job that is deleting the buildpack
+            schema:
+              type: string
+              format: uri
+
       '401':
         $ref: '../components/responses/Unauthorized.yaml'
       '404':
diff --git a/apis/cf/latest/paths/Domains.yaml b/apis/cf/latest/paths/Domains.yaml
index 7080d3c..6c055e9 100644
--- a/apis/cf/latest/paths/Domains.yaml
+++ b/apis/cf/latest/paths/Domains.yaml
@@ -136,8 +136,15 @@
     parameters:
       - $ref: '../components/parameters/Guid.yaml'
     responses:
-      '204':
-        description: Successfully deleted domain
+      '202':
+        description: Accepted
+        headers:
+          Location:
+            description: URL of the job that is deleting the domain
+            schema:
+              type: string
+              format: uri
+
       '401':
         $ref: '../components/responses/Unauthorized.yaml'
       '404':
diff --git a/apis/cf/latest/paths/Manifests.yaml b/apis/cf/latest/paths/Manifests.yaml
index c77349b..cfd2b13 100644
--- a/apis/cf/latest/paths/Manifests.yaml
+++ b/apis/cf/latest/paths/Manifests.yaml
@@ -66,6 +66,26 @@
           schema:
             type: string
     responses:
+      '201':
+        description: Created
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                diff:
+                  type: array
+                  items:
+                    type: object
+                    properties:
+                      op:
+                        type: string
+                      path:
+                        type: string
+                      was:
+                        type: string
+                      value:
+                        type: string
       '202':
         description: Accepted
         content:
diff --git a/apis/cf/latest/paths/Organizations.yaml b/apis/cf/latest/paths/Organizations.yaml
index b7146dd..992c261 100644
--- a/apis/cf/latest/paths/Organizations.yaml
+++ b/apis/cf/latest/paths/Organizations.yaml
@@ -198,9 +198,9 @@
                     self:
                       $ref: '../components/schemas/Link.yaml'
                       description: The URL to get this usage summary
-                      organization:
-                        $ref: '../components/schemas/Link.yaml'
-                        description: The URL to get the organization for this usage summary
+                    organization:
+                      $ref: '../components/schemas/Link.yaml'
+                      description: The URL to get the organization for this usage summary
       '401':
         $ref: '../components/responses/Unauthorized.yaml'
       '404':