Index: genarch/src/acpi/matd.c
===================================================================
--- genarch/src/acpi/matd.c	(revision 9b2729c3ad8e7aff76bee8e6c6439ae01d9ab7f7)
+++ genarch/src/acpi/matd.c	(revision 085d973c11067c76c6bb3481033b2ba387555f4a)
@@ -37,5 +37,5 @@
 #include <config.h>
 #include <print.h>
-#include <mm/heap.h>
+#include <mm/slab.h>
 #include <memstr.h>
 #include <sort.h>
@@ -145,5 +145,5 @@
 
 	/* create madt apic entries index array */
-	madt_entries_index = (struct madt_apic_header * *) early_malloc(madt_entries_index_cnt * sizeof(struct madt_apic_header * *));
+	madt_entries_index = (struct madt_apic_header * *) malloc(madt_entries_index_cnt * sizeof(struct madt_apic_header * *));
 
 	__u32 index = 0;
Index: genarch/src/mm/as_pt.c
===================================================================
--- genarch/src/mm/as_pt.c	(revision 9b2729c3ad8e7aff76bee8e6c6439ae01d9ab7f7)
+++ genarch/src/mm/as_pt.c	(revision 085d973c11067c76c6bb3481033b2ba387555f4a)
@@ -57,5 +57,5 @@
 	ipl_t ipl;
 
-	dst_ptl0 = (pte_t *) frame_alloc(ONE_FRAME, FRAME_KA | FRAME_PANIC);
+	dst_ptl0 = (pte_t *) PA2KA(PFN2ADDR(frame_alloc(ONE_FRAME, FRAME_KA | FRAME_PANIC)));
 
 	if (flags & FLAG_AS_KERNEL) {
Index: genarch/src/mm/page_pt.c
===================================================================
--- genarch/src/mm/page_pt.c	(revision 9b2729c3ad8e7aff76bee8e6c6439ae01d9ab7f7)
+++ genarch/src/mm/page_pt.c	(revision 085d973c11067c76c6bb3481033b2ba387555f4a)
@@ -66,5 +66,5 @@
 
 	if (GET_PTL1_FLAGS(ptl0, PTL0_INDEX(page)) & PAGE_NOT_PRESENT) {
-		newpt = frame_alloc(ONE_FRAME, FRAME_KA);
+		newpt = PA2KA(PFN2ADDR(frame_alloc(ONE_FRAME, FRAME_KA)));
 		memsetb(newpt, PAGE_SIZE, 0);
 		SET_PTL1_ADDRESS(ptl0, PTL0_INDEX(page), KA2PA(newpt));
@@ -75,5 +75,5 @@
 
 	if (GET_PTL2_FLAGS(ptl1, PTL1_INDEX(page)) & PAGE_NOT_PRESENT) {
-		newpt = frame_alloc(ONE_FRAME, FRAME_KA);
+		newpt = PA2KA(PFN2ADDR(frame_alloc(ONE_FRAME, FRAME_KA)));
 		memsetb(newpt, PAGE_SIZE, 0);
 		SET_PTL2_ADDRESS(ptl1, PTL1_INDEX(page), KA2PA(newpt));
@@ -84,5 +84,5 @@
 
 	if (GET_PTL3_FLAGS(ptl2, PTL2_INDEX(page)) & PAGE_NOT_PRESENT) {
-		newpt = frame_alloc(ONE_FRAME, FRAME_KA);
+		newpt = PA2KA(PFN2ADDR(frame_alloc(ONE_FRAME, FRAME_KA)));
 		memsetb(newpt, PAGE_SIZE, 0);
 		SET_PTL3_ADDRESS(ptl2, PTL2_INDEX(page), KA2PA(newpt));