diff --git a/scripts/kernel/generate_kernel_cinfo.py b/scripts/kernel/generate_kernel_cinfo.py
index 16a5e58..8ba818c 100755
--- a/scripts/kernel/generate_kernel_cinfo.py
+++ b/scripts/kernel/generate_kernel_cinfo.py
@@ -77,6 +77,7 @@ pager_end = \
 cap_virtmem = \
 '''
 \t\t\t[%(capidx)d] = {
+\t\t\t\t.target = %(cn)d,
 \t\t\t\t.type = CAP_TYPE_MAP_VIRTMEM | CAP_RTYPE_CONTAINER,
 \t\t\t\t.access = CAP_MAP_READ | CAP_MAP_WRITE | CAP_MAP_EXEC
 \t\t\t\t\t| CAP_MAP_CACHED | CAP_MAP_UNCACHED | CAP_MAP_UNMAP | CAP_MAP_UTCB,
@@ -89,6 +90,7 @@ cap_virtmem = \
 cap_physmem = \
 '''
 \t\t\t[%(capidx)d] = {
+\t\t\t\t.target = %(cn)d,
 \t\t\t\t.type = CAP_TYPE_MAP_PHYSMEM | CAP_RTYPE_CONTAINER,
 \t\t\t\t.access = CAP_MAP_READ | CAP_MAP_WRITE | CAP_MAP_EXEC |
 \t\t\t\t\tCAP_MAP_CACHED | CAP_MAP_UNCACHED | CAP_MAP_UNMAP | CAP_MAP_UTCB,
diff --git a/src/generic/container.c b/src/generic/container.c
index 4beca9b..8f3f229 100644
--- a/src/generic/container.c
+++ b/src/generic/container.c
@@ -190,8 +190,8 @@ int init_pager(struct pager *pager,
  * are initialized, which includes the pager thread ids
  * and pager space ids.
  *
- * Update all capability target ids that target such
- * run-time allocated resources.
+ * This updates all capability target ids where the target
+ * is a run-time allocated resource with a new resource id.
  */
 int update_dynamic_capids(struct kernel_resources *kres)
 {