diff --git a/reactos/boot/bootdata/txtsetup.sif b/reactos/boot/bootdata/txtsetup.sif
index 1c1bcf39602..2677de59f1b 100644
--- a/reactos/boot/bootdata/txtsetup.sif
+++ b/reactos/boot/bootdata/txtsetup.sif
@@ -33,7 +33,7 @@ pci.sys=,,,,,,,,,,,,4
 scsiport.sys=,,,,,,x,,,,,,4
 uniata.sys=,,,,,,,,,,,,4
 fastfat.sys=,,,,,,x,,,,,,4
-ext2.sys=,,,,,,x,,,,,,4
+;ext2.sys=,,,,,,x,,,,,,4
 
 [HardwareIdsDatabase]
 *PNP0C08 = acpi
diff --git a/reactos/boot/freeldr/freeldr/arch/amd64/loader.c b/reactos/boot/freeldr/freeldr/arch/amd64/loader.c
index bf23c4bafc9..87517ff9e47 100644
--- a/reactos/boot/freeldr/freeldr/arch/amd64/loader.c
+++ b/reactos/boot/freeldr/freeldr/arch/amd64/loader.c
@@ -117,7 +117,7 @@ FrLdrGetOrCreatePageDir(PPAGE_DIRECTORY_AMD64 pDir, ULONG Index)
 		if (!pSubDir)
 			return NULL;
 		RtlZeroMemory(pSubDir, PAGE_SIZE);
-		pDir->Pde[Index].PageFrameNumber = (ULONGLONG)pSubDir / PAGE_SIZE;
+		pDir->Pde[Index].PageFrameNumber = PtrToPfn(pSubDir);
 		pDir->Pde[Index].Valid = 1;
 		pDir->Pde[Index].Write = 1;
 	}
@@ -196,7 +196,7 @@ FrLdrSetupPageDirectory(VOID)
 	ULONG KernelPages;
 
 	/* Allocate a Page for the PML4 */
-	pPML4 = MmAllocateMemoryWithType(4096, LoaderSpecialMemory);
+	pPML4 = MmAllocateMemoryWithType(PAGE_SIZE, LoaderSpecialMemory);
 
 	ASSERT(pPML4);
 
@@ -205,7 +205,7 @@ FrLdrSetupPageDirectory(VOID)
 	 * virtual address 0xfffff6fb7dbedf68 */
 	pPML4->Pde[VAtoPXI(PXE_BASE)].Valid = 1;
 	pPML4->Pde[VAtoPXI(PXE_BASE)].Write = 1;
-	pPML4->Pde[VAtoPXI(PXE_BASE)].PageFrameNumber = PtrToPfn(PXE_BASE);
+	pPML4->Pde[VAtoPXI(PXE_BASE)].PageFrameNumber = PtrToPfn(pPML4);
 
 	/* Setup low memory pages */
 	if (FrLdrMapRangeOfPages(0, 0, 1024) < 1024)
diff --git a/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h b/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h
index d574b2692a5..af4e4e13e8e 100644
--- a/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h
+++ b/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h
@@ -30,7 +30,7 @@
 #define VA_MASK 0x0000FFFFFFFFFFFFUL
 
 #define PtrToPfn(p) \
-    ((((ULONGLONG)p) >> PAGE_SHIFT) & 0xffffffffffULL)
+    ((((ULONGLONG)p) >> PAGE_SHIFT) & 0xfffffffULL)
 
 #define VAtoPXI(va) (((va) >> PXI_SHIFT) & 0x1FF)
 #define VAtoPPI(va) (((va) >> PPI_SHIFT) & 0x1FF)