diff --git a/sys/denali/lib/denali/denali.yunq.server.cpp b/sys/denali/lib/denali/denali.yunq.server.cpp
index af1ed35..4c9370b 100644
--- a/sys/denali/lib/denali/denali.yunq.server.cpp
+++ b/sys/denali/lib/denali/denali.yunq.server.cpp
@@ -68,7 +68,7 @@ void DenaliServerBase::ServerThread() {
       reply_err = ZReplyPortSend(reply_port_cap, kHeaderSize + resp_length, resp_buffer.RawPtr(), resp_cap.UsedSlots(), resp_cap.RawPtr());
     }
     if (reply_err != glcr::OK) {
-      dbgln("Error in reply: %x", recv_err);
+      dbgln("Error in reply: %x", reply_err);
     }
   }
 
diff --git a/sys/yellowstone/lib/yellowstone/yellowstone.yunq.server.cpp b/sys/yellowstone/lib/yellowstone/yellowstone.yunq.server.cpp
index c9660fe..bbe89f2 100644
--- a/sys/yellowstone/lib/yellowstone/yellowstone.yunq.server.cpp
+++ b/sys/yellowstone/lib/yellowstone/yellowstone.yunq.server.cpp
@@ -68,7 +68,7 @@ void YellowstoneServerBase::ServerThread() {
       reply_err = ZReplyPortSend(reply_port_cap, kHeaderSize + resp_length, resp_buffer.RawPtr(), resp_cap.UsedSlots(), resp_cap.RawPtr());
     }
     if (reply_err != glcr::OK) {
-      dbgln("Error in reply: %x", recv_err);
+      dbgln("Error in reply: %x", reply_err);
     }
   }
 
diff --git a/yunq/example.yunq.client.cpp b/yunq/example.yunq.client.cpp
index 938fd60..0189543 100644
--- a/yunq/example.yunq.client.cpp
+++ b/yunq/example.yunq.client.cpp
@@ -16,12 +16,12 @@ glcr::ErrorCode VFSClient::open(const OpenFileRequest& request, File& response)
   buffer_.WriteAt<uint32_t>(0, kSentinel);
   buffer_.WriteAt<uint64_t>(8, 0);
 
+  cap_buffer_.Reset();
   uint64_t length = request.SerializeToBytes(buffer_, /*offset=*/16, cap_buffer_);
   buffer_.WriteAt<uint32_t>(4, 16 + length);
 
   z_cap_t reply_port_cap;
-  // FIXME: We need to be able to send capabilities via endpoint call.
-  RET_ERR(ZEndpointSend(endpoint_, 16 + length, buffer_.RawPtr(), &reply_port_cap)); 
+  RET_ERR(ZEndpointSend(endpoint_, 16 + length, buffer_.RawPtr(), cap_buffer_.UsedSlots(), cap_buffer_.RawPtr(), &reply_port_cap)); 
 
   // FIXME: Add a way to zero out the first buffer.
   RET_ERR(ZReplyPortRecv(reply_port_cap, &buffer_size, buffer_.RawPtr(), &cap_size, cap_buffer_.RawPtr()));
diff --git a/yunq/example.yunq.server.cpp b/yunq/example.yunq.server.cpp
index 31d230a..aee644e 100644
--- a/yunq/example.yunq.server.cpp
+++ b/yunq/example.yunq.server.cpp
@@ -42,14 +42,15 @@ Thread VFSServerBase::RunServer() {
 
 void VFSServerBase::ServerThread() {
   glcr::ByteBuffer recv_buffer(0x1000);
+  glcr::CapBuffer recv_cap(0x10);
   glcr::ByteBuffer resp_buffer(0x1000);
-  uint64_t resp_cap_size = 0x10;
-  glcr::CapBuffer resp_cap(resp_cap_size);
+  glcr::CapBuffer resp_cap(0x10);
   z_cap_t reply_port_cap;
 
   while (true) {
+    uint64_t recv_cap_size = 0x10;
     uint64_t recv_buf_size = 0x1000;
-    glcr::ErrorCode recv_err = ZEndpointRecv(endpoint_, &recv_buf_size, recv_buffer.RawPtr(), &reply_port_cap);
+    glcr::ErrorCode recv_err = ZEndpointRecv(endpoint_, &recv_buf_size, recv_buffer.RawPtr(), &recv_cap_size, recv_cap.RawPtr(), &reply_port_cap);
     if (recv_err != glcr::OK) {
       dbgln("Error in receive: %x", recv_err);
       continue;
@@ -58,7 +59,7 @@ void VFSServerBase::ServerThread() {
     uint64_t resp_length = 0;
     
     glcr::ErrorCode reply_err = glcr::OK;
-    glcr::ErrorCode err = HandleRequest(recv_buffer, resp_buffer, resp_length, resp_cap);
+    glcr::ErrorCode err = HandleRequest(recv_buffer, recv_cap, resp_buffer, resp_length, resp_cap);
     if (err != glcr::OK) {
       WriteError(resp_buffer, err);
       reply_err = ZReplyPortSend(reply_port_cap, kHeaderSize, resp_buffer.RawPtr(), 0, nullptr);
@@ -67,13 +68,14 @@ void VFSServerBase::ServerThread() {
       reply_err = ZReplyPortSend(reply_port_cap, kHeaderSize + resp_length, resp_buffer.RawPtr(), resp_cap.UsedSlots(), resp_cap.RawPtr());
     }
     if (reply_err != glcr::OK) {
-      dbgln("Error in reply: %x", recv_err);
+      dbgln("Error in reply: %x", reply_err);
     }
   }
 
 }
 
 glcr::ErrorCode VFSServerBase::HandleRequest(const glcr::ByteBuffer& request,
+                                                            const glcr::CapBuffer& req_caps,
                                                             glcr::ByteBuffer& response, uint64_t& resp_length,
                                                             glcr::CapBuffer& resp_caps) {
   if (request.At<uint32_t>(0) != kSentinel) {
@@ -87,7 +89,7 @@ glcr::ErrorCode VFSServerBase::HandleRequest(const glcr::ByteBuffer& request,
       OpenFileRequest yunq_request;
       File yunq_response;
 
-      yunq_request.ParseFromBytes(request, kHeaderSize);
+      yunq_request.ParseFromBytes(request, kHeaderSize, req_caps);
 
       RET_ERR(Handleopen(yunq_request, yunq_response));
 
diff --git a/yunq/example.yunq.server.h b/yunq/example.yunq.server.h
index e801486..71c9bab 100644
--- a/yunq/example.yunq.server.h
+++ b/yunq/example.yunq.server.h
@@ -30,8 +30,8 @@ class VFSServerBase {
   friend void VFSServerBaseThreadBootstrap(void*);
   void ServerThread();
 
-  [[nodiscard]] glcr::ErrorCode HandleRequest(const glcr::ByteBuffer& request, glcr::ByteBuffer& response,
-                                              uint64_t& resp_length,
+  [[nodiscard]] glcr::ErrorCode HandleRequest(const glcr::ByteBuffer& request, const glcr::CapBuffer& req_caps,
+                                              glcr::ByteBuffer& response, uint64_t& resp_length,
                                               glcr::CapBuffer& resp_caps);
 };
 
diff --git a/yunq/server.cpp.jinja b/yunq/server.cpp.jinja
index 3cf6549..61abfd7 100644
--- a/yunq/server.cpp.jinja
+++ b/yunq/server.cpp.jinja
@@ -68,7 +68,7 @@ void {{interface.name}}ServerBase::ServerThread() {
       reply_err = ZReplyPortSend(reply_port_cap, kHeaderSize + resp_length, resp_buffer.RawPtr(), resp_cap.UsedSlots(), resp_cap.RawPtr());
     }
     if (reply_err != glcr::OK) {
-      dbgln("Error in reply: %x", recv_err);
+      dbgln("Error in reply: %x", reply_err);
     }
   }