diff --git a/api/cl_khr_command_buffer.asciidoc b/api/cl_khr_command_buffer.asciidoc
index a4ade6c6..a71d0ec9 100644
--- a/api/cl_khr_command_buffer.asciidoc
+++ b/api/cl_khr_command_buffer.asciidoc
@@ -205,11 +205,6 @@ features:
   ** {clCommandSVMMemcpyKHR}
   ** {clCommandSVMMemFillKHR}
 
-=== New Structures
-
-  * {cl_command_buffer_khr_TYPE}
-  * {cl_mutable_command_khr_TYPE}
-
 === New Types
 
   * {cl_device_command_buffer_capabilities_khr_TYPE}
diff --git a/api/opencl_runtime_layer.asciidoc b/api/opencl_runtime_layer.asciidoc
index de138f55..cb790895 100644
--- a/api/opencl_runtime_layer.asciidoc
+++ b/api/opencl_runtime_layer.asciidoc
@@ -14145,7 +14145,10 @@ returned in _errcode_ret_:
     specified by {CL_DEVICE_COMMAND_BUFFER_REQUIRED_QUEUE_PROPERTIES_KHR}.
   * {CL_INVALID_CONTEXT} if all the command-queues in _queues_ do not have
     the same OpenCL context.
-  * {CL_INVALID_VALUE} if _num_queues_ is zero.
+  * {CL_INVALID_VALUE} if the `<<cl_khr_command_buffer_multi_device>>`
+    extension is supported and _num_queues_ is zero, or if the
+    `<<cl_khr_command_buffer_multi_device>>` extension is not supported
+    and _num_queues_ is not one.
   * {CL_INVALID_VALUE} if _queues_ is `NULL`.
   * {CL_INVALID_VALUE} if values specified in _properties_ are not valid, or
     if the same property name is specified more than once.