Index: generic/src/proc/task.c
===================================================================
--- generic/src/proc/task.c	(revision 9a2d6e1cf6667f28beec57a2227821b398296732)
+++ generic/src/proc/task.c	(revision 649799a0fe9f7bc1df2587fdea23c0763d276be5)
@@ -38,5 +38,4 @@
 #include <adt/list.h>
 #include <ipc/ipc.h>
-#include <ipc/ns.h>
 #include <memstr.h>
 
@@ -111,5 +110,5 @@
 	as = as_create(0);
 
-	rc = elf_load((elf_header_t *) config.init_addr, as);
+	rc = elf_load((elf_header_t *) program_addr, as);
 	if (rc != EE_OK) {
 		as_free(as);
@@ -118,5 +117,5 @@
 	
 	task = task_create(as);
-	t = thread_create(uinit, (void *)((elf_header_t *) config.init_addr)->e_entry, 
+	t = thread_create(uinit, (void *)((elf_header_t *)program_addr)->e_entry, 
 			  task, THREAD_USER_STACK);