diff --git a/server/include/list.h b/server/include/list.h
index 4c9f5d373..341048b22 100644
--- a/server/include/list.h
+++ b/server/include/list.h
@@ -24,7 +24,7 @@ struct interface;
 #define LIST_INIT { \
 	.head = NULL, \
 	.tail = NULL, \
-	.count = 0, \
+	.length = 0, \
 	.lock = PTHREAD_MUTEX_INITIALIZER \
 }
 
@@ -38,7 +38,7 @@ struct interface;
 				
 #define list_first(list)	((list)->head)
 #define list_last(list)		((list)->head)
-#define list_length(list)	((list)->count)
+#define list_length(list)	((list)->length)
 
 /** Callback to destroy list elements.
  *
@@ -48,7 +48,7 @@ typedef void (*dtor_cb_t)(void *data);
 
 struct list {
 	struct list_elm *head, *tail;
-	int count;
+	int length;
 
 	dtor_cb_t destructor;
 	pthread_mutex_t lock;
@@ -61,6 +61,8 @@ struct list_elm {
 		struct path *path;
 		struct interface *interface;
 		struct socket *socket;
+		struct opal *opal;
+		struct gtfpga *gtfpga;
 		hook_cb_t hook;
 	} /* anonymous */;
 
diff --git a/server/src/list.c b/server/src/list.c
index 8a99365fa..635dc6dd0 100644
--- a/server/src/list.c
+++ b/server/src/list.c
@@ -14,7 +14,7 @@ void list_init(struct list *l, dtor_cb_t dtor)
 	pthread_mutex_init(&l->lock, NULL);
 	
 	l->destructor = dtor;
-	l->count = 0;
+	l->length = 0;
 	l->head = NULL;
 	l->tail = NULL;
 }
@@ -57,7 +57,7 @@ void list_push(struct list *l, void *p)
 
 	l->tail = e;
 	
-	l->count++;
+	l->length++;
 
 	pthread_mutex_unlock(&l->lock);
 }