diff --git a/scripts/core/enqueue.yml b/scripts/core/enqueue.yml
index f712dd9021..316ec0fd21 100644
--- a/scripts/core/enqueue.yml
+++ b/scripts/core/enqueue.yml
@@ -782,7 +782,9 @@ desc: "Enqueue a command to fill an image object with specified color"
 class: $xEnqueue
 name: MemImageFill
 ordinal: "0"
-version: "9999.0" # see #50
+# Will not be generated
+# https://github.com/oneapi-src/unified-runtime/issues/50
+version: "9999.0"
 details:
     - "Currently not implemented in Level Zero"
     - "TODO: add a driver function in Level Zero?"
@@ -919,7 +921,9 @@ type: function
 desc: "Enqueue a command to map a region of the image object into the host address space and return a pointer to the mapped region"
 class: $xEnqueue
 name: MemImageMap
-version: "9999.0" # See #50
+# Will not be generated
+# https://github.com/oneapi-src/unified-runtime/issues/50
+version: "9999.0"
 ordinal: "0"
 details:
     - "Input parameter blockingMap indicates if the map is blocking or non-blocking."
diff --git a/scripts/core/event.yml b/scripts/core/event.yml
index 2f42cb7122..4e93faa9f3 100644
--- a/scripts/core/event.yml
+++ b/scripts/core/event.yml
@@ -43,14 +43,18 @@ etors:
       desc: Event created by $xEnqueueMemImageWrite
     - name: MEM_IMAGE_COPY
       desc: Event created by $xEnqueueMemImageCopy
+    # Will not be generated
+    # https://github.com/oneapi-src/unified-runtime/issues/50
     - name: MEM_IMAGE_FILL
       desc: Event created by $xEnqueueMemImageFill
-      version: "9999.0" # See #50
+      version: "9999.0"
     - name: MEM_BUFFER_MAP
       desc: Event created by $xEnqueueMemBufferMap
+    # Will not be generated
+    # https://github.com/oneapi-src/unified-runtime/issues/50
     - name: MEM_IMAGE_MAP
       desc: Event created by $xEnqueueMemImageMap
-      version: "9999.0" # See #50
+      version: "9999.0"
     - name: MEM_UNMAP
       desc: Event created by $xEnqueueMemUnmap
     - name: USM_FILL
diff --git a/source/adapters/cuda/adapter.cpp b/source/adapters/cuda/adapter.cpp
index 49bb964f8e..3ea896bbd6 100644
--- a/source/adapters/cuda/adapter.cpp
+++ b/source/adapters/cuda/adapter.cpp
@@ -38,7 +38,8 @@ class ur_legacy_sink : public logger::Sink {
 };
 
 // FIXME: Remove the default log level when querying logging info is supported
-// through UR entry points. See #1330.
+// through UR entry points.
+// https://github.com/oneapi-src/unified-runtime/issues/1330
 ur_adapter_handle_t_::ur_adapter_handle_t_()
     : logger(logger::get_logger("cuda",
                                 /*default_log_level*/ logger::Level::ERR)) {
diff --git a/source/adapters/cuda/memory.cpp b/source/adapters/cuda/memory.cpp
index 8b4db742ac..3fde345590 100644
--- a/source/adapters/cuda/memory.cpp
+++ b/source/adapters/cuda/memory.cpp
@@ -17,7 +17,8 @@
 
 /// Creates a UR Memory object using a CUDA memory allocation.
 /// Can trigger a manual copy depending on the mode.
-/// \TODO Implement USE_HOST_PTR using cuHostRegister - See #9789
+/// \TODO Implement USE_HOST_PTR using cuHostRegister
+/// https://github.com/intel/llvm/issues/9789
 ///
 UR_APIEXPORT ur_result_t UR_APICALL urMemBufferCreate(
     ur_context_handle_t hContext, ur_mem_flags_t flags, size_t size,
diff --git a/source/adapters/hip/adapter.cpp b/source/adapters/hip/adapter.cpp
index 1bfe498bf6..9daaee8a29 100644
--- a/source/adapters/hip/adapter.cpp
+++ b/source/adapters/hip/adapter.cpp
@@ -37,7 +37,8 @@ class ur_legacy_sink : public logger::Sink {
 };
 
 // FIXME: Remove the default log level when querying logging info is supported
-// through UR entry points. See #1330.
+// through UR entry points.
+// https://github.com/oneapi-src/unified-runtime/issues/1330
 ur_adapter_handle_t_::ur_adapter_handle_t_()
     : logger(
           logger::get_logger("hip", /*default_log_level*/ logger::Level::ERR)) {
diff --git a/source/adapters/hip/memory.cpp b/source/adapters/hip/memory.cpp
index 93d8450862..96cd53bd9a 100644
--- a/source/adapters/hip/memory.cpp
+++ b/source/adapters/hip/memory.cpp
@@ -90,7 +90,8 @@ UR_APIEXPORT ur_result_t UR_APICALL urMemRelease(ur_mem_handle_t hMem) {
 
 /// Creates a UR Memory object using a HIP memory allocation.
 /// Can trigger a manual copy depending on the mode.
-/// \TODO Implement USE_HOST_PTR using hipHostRegister - See #9789
+/// \TODO Implement USE_HOST_PTR using hipHostRegister
+/// https://github.com/intel/llvm/issues/9789
 UR_APIEXPORT ur_result_t UR_APICALL urMemBufferCreate(
     ur_context_handle_t hContext, ur_mem_flags_t flags, size_t size,
     const ur_buffer_properties_t *pProperties, ur_mem_handle_t *phBuffer) {