diff --git a/src/libveo/AsyncTransfer.cpp b/src/libveo/AsyncTransfer.cpp
index 866fe30..dc6a391 100644
--- a/src/libveo/AsyncTransfer.cpp
+++ b/src/libveo/AsyncTransfer.cpp
@@ -17,7 +17,7 @@ namespace veo {
  */
 uint64_t ThreadContext::asyncReadMem(void *dst, uint64_t src, size_t size)
 {
-  auto id = this->issueRequestID();
+  auto id = this->comq.issueRequestID();
   auto f = [this, dst, src, size] (Command *cmd) {
     auto rv = this->_readMem(dst, src, size);
     cmd->setResult(rv, rv == 0 ? VEO_COMMAND_OK : VEO_COMMAND_ERROR);
@@ -31,7 +31,7 @@ uint64_t ThreadContext::asyncReadMem(void *dst, uint64_t src, size_t size)
 uint64_t ThreadContext::asyncWriteMem(uint64_t dst, const void *src,
                                       size_t size)
 {
-  auto id = this->issueRequestID();
+  auto id = this->comq.issueRequestID();
   auto f = [this, dst, src, size] (Command *cmd) {
     auto rv = this->_writeMem(dst, src, size);
     cmd->setResult(rv, rv == 0 ? VEO_COMMAND_OK : VEO_COMMAND_ERROR);
diff --git a/src/libveo/ThreadContext.cpp b/src/libveo/ThreadContext.cpp
index 649159f..0b67427 100644
--- a/src/libveo/ThreadContext.cpp
+++ b/src/libveo/ThreadContext.cpp
@@ -426,7 +426,7 @@ int ThreadContext::close()
  */
 uint64_t ThreadContext::callAsync(uint64_t addr, CallArgs &args)
 {
-  auto id = this->issueRequestID();
+  auto id = this->comq.issueRequestID();
   auto f = [&args, this, addr, id] (Command *cmd) {
     VEO_TRACE(this, "[request #%d] start...", id);
     this->_doCall(addr, args);
@@ -464,7 +464,7 @@ uint64_t ThreadContext::callAsync(uint64_t addr, CallArgs &args)
 uint64_t ThreadContext::_callOpenContext(ProcHandle *proc,
                                          uint64_t addr, CallArgs &args)
 {
-  auto id = this->issueRequestID();
+  auto id = this->comq.issueRequestID();
   auto f = [&args, this, proc, addr, id] (Command *cmd) {
     VEO_TRACE(this, "[request #%d] start...", id);
     this->_doCall(addr, args);
diff --git a/src/libveo/api.cpp b/src/libveo/api.cpp
index c6772f4..97842e9 100644
--- a/src/libveo/api.cpp
+++ b/src/libveo/api.cpp
@@ -95,7 +95,7 @@ using veo::VEOException;
  *
  * @retval integer value with API version
  */
-int veo_api_version()
+const int veo_api_version()
 {
   return VEO_API_VERSION;
 }