diff --git a/include/menix/memory/vm.h b/include/menix/memory/vm.h
index 669ba65..5878338 100644
--- a/include/menix/memory/vm.h
+++ b/include/menix/memory/vm.h
@@ -56,10 +56,12 @@ typedef struct
 extern PageMap* vm_kernel_map;
 extern VirtAddr kernel_map_base;
 
+// User constants
 #define VM_USER_STACK_SIZE	 0x200000
-#define VM_USER_STACK_BASE	 0x200000
+#define VM_USER_STACK_BASE	 0x00007F0000000000
+#define VM_USER_MAP_BASE	 0x0000600000000000
+// Kernel constants
 #define VM_KERNEL_STACK_SIZE 0x200000
-#define VM_USER_MAP_BASE	 0x00007F0000000000
 #define VM_MAP_BASE			 0xFFFF900000000000
 #define VM_MEMORY_BASE		 0xFFFFA00000000000
 #define VM_MODULE_BASE		 0xFFFFB00000000000
diff --git a/include/menix/system/elf.h b/include/menix/system/elf.h
index 72cec9a..88b9b21 100644
--- a/include/menix/system/elf.h
+++ b/include/menix/system/elf.h
@@ -51,7 +51,6 @@
 #define PT_SHLIB			0x00000005
 #define PT_PHDR				0x00000006
 #define PT_TLS				0x00000007
-#define PT_MODULE			0x61111111	  //! Custom type to mark the module segment/.mod section.
 // Program Header Flags
 #define PF_X				0x01
 #define PF_W				0x02