diff --git a/reactos/ntoskrnl/mm/ARM3/hypermap.c b/reactos/ntoskrnl/mm/ARM3/hypermap.c
index a1280f99086..2dc9dc04ae6 100644
--- a/reactos/ntoskrnl/mm/ARM3/hypermap.c
+++ b/reactos/ntoskrnl/mm/ARM3/hypermap.c
@@ -46,7 +46,7 @@ MiMapPageInHyperSpace(IN PEPROCESS Process,
     //
     TempPte = HyperTemplatePte;
     TempPte.u.Hard.PageFrameNumber = Page;
-    TempPte.u.Hard.Global = 0; // Hyperspace is local!
+    MI_MAKE_LOCAL_PAGE(&TempPte); // Hyperspace is local!
 
     //
     // Pick the first hyperspace PTE
@@ -157,7 +157,7 @@ MiMapPagesToZeroInHyperSpace(IN PMMPFN *Pages,
     //
     PointerPte += (Offset + 1);
     TempPte = HyperTemplatePte;
-    TempPte.u.Hard.Global = FALSE; // Hyperspace is local!
+    MI_MAKE_LOCAL_PAGE(&TempPte); // Hyperspace is local!
     do
     {
         //
diff --git a/reactos/ntoskrnl/mm/ARM3/iosup.c b/reactos/ntoskrnl/mm/ARM3/iosup.c
index 93d2e66a8c4..5d3452b2ad4 100644
--- a/reactos/ntoskrnl/mm/ARM3/iosup.c
+++ b/reactos/ntoskrnl/mm/ARM3/iosup.c
@@ -115,8 +115,8 @@ MmMapIoSpace(IN PHYSICAL_ADDRESS PhysicalAddress,
             //
             // Disable the cache
             //
-            TempPte.u.Hard.CacheDisable = 1;
-            TempPte.u.Hard.WriteThrough = 1;
+            MI_PAGE_DISABLE_CACHE(&TempPte);
+            MI_PAGE_WRITE_THROUGH(&TempPte);
             break;
             
         case MiCached:
diff --git a/reactos/ntoskrnl/mm/ARM3/mdlsup.c b/reactos/ntoskrnl/mm/ARM3/mdlsup.c
index 3bc121cd77b..e0bb4db75bf 100644
--- a/reactos/ntoskrnl/mm/ARM3/mdlsup.c
+++ b/reactos/ntoskrnl/mm/ARM3/mdlsup.c
@@ -369,8 +369,8 @@ MmMapLockedPagesSpecifyCache(IN PMDL Mdl,
                 //
                 // Disable caching
                 //
-                TempPte.u.Hard.CacheDisable = 1;
-                TempPte.u.Hard.WriteThrough = 1;
+                MI_PAGE_DISABLE_CACHE(&TempPte);
+                MI_PAGE_WRITE_THROUGH(&TempPte);
                 break;
                 
             case MiWriteCombined:
@@ -378,8 +378,8 @@ MmMapLockedPagesSpecifyCache(IN PMDL Mdl,
                 //
                 // Enable write combining
                 //
-                TempPte.u.Hard.CacheDisable = 1;
-                TempPte.u.Hard.WriteThrough = 0;
+                MI_PAGE_DISABLE_CACHE(&TempPte);
+                MI_PAGE_WRITE_COMBINED(&TempPte);
                 break;
                 
             default:
@@ -856,12 +856,12 @@ MmProbeAndLockPages(IN PMDL Mdl,
             //
             // Check if the PTE is not writable
             //
-            if (!PointerPte->u.Hard.Write)
+            if (MI_IS_PAGE_WRITEABLE(PointerPte) == FALSE)
             {
                 //
                 // Check if it's copy on write
                 //
-                if (PointerPte->u.Hard.CopyOnWrite)
+                if (MI_IS_PAGE_COPY_ON_WRITE(PointerPte))
                 {
                     //
                     // Get the base address and allow a change for user-mode
diff --git a/reactos/ntoskrnl/mm/ARM3/ncache.c b/reactos/ntoskrnl/mm/ARM3/ncache.c
index 97928eaa02c..7979d391847 100644
--- a/reactos/ntoskrnl/mm/ARM3/ncache.c
+++ b/reactos/ntoskrnl/mm/ARM3/ncache.c
@@ -120,8 +120,8 @@ MmAllocateNonCachedMemory(IN ULONG NumberOfBytes)
             //
             // Disable caching
             //
-            TempPte.u.Hard.CacheDisable = 1;
-            TempPte.u.Hard.WriteThrough = 1;
+            MI_PAGE_DISABLE_CACHE(&TempPte);
+            MI_PAGE_WRITE_THROUGH(&TempPte);
             break;
             
         case MiWriteCombined:
@@ -129,8 +129,8 @@ MmAllocateNonCachedMemory(IN ULONG NumberOfBytes)
             //
             // Enable write combining
             //
-            TempPte.u.Hard.CacheDisable = 1;
-            TempPte.u.Hard.WriteThrough = 0;
+            MI_PAGE_DISABLE_CACHE(&TempPte);
+            MI_PAGE_WRITE_COMBINED(&TempPte);
             break;
             
         default:
diff --git a/reactos/ntoskrnl/mm/ARM3/procsup.c b/reactos/ntoskrnl/mm/ARM3/procsup.c
index 5349106d6db..919b3e43de4 100644
--- a/reactos/ntoskrnl/mm/ARM3/procsup.c
+++ b/reactos/ntoskrnl/mm/ARM3/procsup.c
@@ -128,9 +128,9 @@ MmCreateKernelStack(IN BOOLEAN GuiStack,
     // Setup the template stack PTE
     //
     TempPte = HyperTemplatePte;
-    TempPte.u.Hard.Global = FALSE;
+    MI_MAKE_LOCAL_PAGE(&TempPte);
+    MI_MAKE_DIRTY_PAGE(&TempPte);
     TempPte.u.Hard.PageFrameNumber = 0;
-    TempPte.u.Hard.Dirty = TRUE;
     
     //
     // Acquire the PFN DB lock
@@ -225,9 +225,9 @@ MmGrowKernelStackEx(IN PVOID StackPointer,
     // Setup the template stack PTE
     //
     TempPte = HyperTemplatePte;
-    TempPte.u.Hard.Global = FALSE;
+    MI_MAKE_LOCAL_PAGE(&TempPte);
+    MI_MAKE_DIRTY_PAGE(&TempPte);
     TempPte.u.Hard.PageFrameNumber = 0;
-    TempPte.u.Hard.Dirty = TRUE;
     
     //
     // Acquire the PFN DB lock
diff --git a/reactos/ntoskrnl/mm/ARM3/syspte.c b/reactos/ntoskrnl/mm/ARM3/syspte.c
index df076d084e7..73a11801682 100644
--- a/reactos/ntoskrnl/mm/ARM3/syspte.c
+++ b/reactos/ntoskrnl/mm/ARM3/syspte.c
@@ -364,7 +364,7 @@ MiInitializeSystemPtes(IN PMMPTE StartingPte,
     //
     // Set the starting and ending PTE addresses for this space
     //
-    MmSystemPteBase = (PVOID)PAGETABLE_MAP;
+    MmSystemPteBase = (PVOID)PTE_BASE;
     MmSystemPtesStart[PoolType] = StartingPte;
     MmSystemPtesEnd[PoolType] = StartingPte + NumberOfPtes - 1;
     DPRINT("System PTE space for %d starting at: %p and ending at: %p\n",