diff --git a/config/caps.py b/config/caps.py
index b447cc2..96dba55 100644
--- a/config/caps.py
+++ b/config/caps.py
@@ -144,7 +144,7 @@ cap_strings = { 'ipc' : \
 \t\t\t[${idx}] = {
 \t\t\t\t/* For device selection */
 \t\t\t\t.target = ${cid},
-\t\t\t\t.uattr[0] = CAP_DEVTYPE_UART | (${devnum} << 16),
+\t\t\t\t.attr = CAP_DEVTYPE_UART | (${devnum} << 16),
 \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,
@@ -158,7 +158,7 @@ cap_strings = { 'ipc' : \
 \t\t\t[${idx}] = {
 \t\t\t\t/* For device selection */
 \t\t\t\t.target = ${cid},
-\t\t\t\t.uattr[0] = CAP_DEVTYPE_TIMER | (${devnum} << 16),
+\t\t\t\t.attr = CAP_DEVTYPE_TIMER | (${devnum} << 16),
 \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/conts/baremetal/baremetal5/main.c b/conts/baremetal/baremetal5/main.c
index ad4c44f..311f76d 100644
--- a/conts/baremetal/baremetal5/main.c
+++ b/conts/baremetal/baremetal5/main.c
@@ -194,6 +194,7 @@ static struct address_pool device_vaddr_pool;
 /*
  * Initialize a virtual address pool
  * for mapping physical devices.
+ 
  */
 void init_vaddr_pool(void)
 {
diff --git a/src/generic/capability.c b/src/generic/capability.c
index 360131b..58542f3 100644
--- a/src/generic/capability.c
+++ b/src/generic/capability.c
@@ -15,7 +15,7 @@
 #include <l4/api/thread.h>
 #include <l4/api/exregs.h>
 #include <l4/api/ipc.h>
-#include <l4/api/irq.h>
+//#include <l4/api/irq.h>
 #include INC_GLUE(message.h)
 #include INC_GLUE(ipc.h)
 
diff --git a/src/generic/resource.c b/src/generic/resource.c
index 7cff3e8..74c5c50 100644
--- a/src/generic/resource.c
+++ b/src/generic/resource.c
@@ -508,9 +508,7 @@ int copy_pager_info(struct pager *pager, struct pager_info *pinfo)
 		cap->start = cap_info->start;
 		cap->end = cap_info->end;
 		cap->size = cap_info->size;
-		cap->uattr[0] = cap_info->uattr[0];
-		cap->uattr[1] = cap_info->uattr[1];
-		
+		cap->attr = cap_info->attr;
 
 		cap_list_insert(cap, &pager->cap_list);
 	}