diff --git a/Source/GmmLib/TranslationTable/GmmAuxTable.cpp b/Source/GmmLib/TranslationTable/GmmAuxTable.cpp
index 4c3d04b..9c5ce27 100644
--- a/Source/GmmLib/TranslationTable/GmmAuxTable.cpp
+++ b/Source/GmmLib/TranslationTable/GmmAuxTable.cpp
@@ -519,7 +519,7 @@
                 {
                     // Clear valid bit of L2 entry
                     L2e.Valid                                    = 0;
-                    ((GMM_AUXTTL2e *)L2GfxAddress)[L2eIdx].Valid = 0;
+                    ((GMM_AUXTTL2e *)L2CPUAddress)[L2eIdx].Valid = 0;
                 }
                 if(DoNotWait)
                 {
diff --git a/Source/GmmLib/TranslationTable/GmmPageTableMgr.cpp b/Source/GmmLib/TranslationTable/GmmPageTableMgr.cpp
index 55e6a33..679d94b 100644
--- a/Source/GmmLib/TranslationTable/GmmPageTableMgr.cpp
+++ b/Source/GmmLib/TranslationTable/GmmPageTableMgr.cpp
@@ -69,7 +69,7 @@
         }
 
         pAlloc->GfxVA  = Alloc.gfxAddr;
-        pAlloc->CPUVA  = Alloc.gfxAddr; 
+        pAlloc->CPUVA  = (GMM_GFX_ADDRESS) Alloc.cpuAddr;
         pAlloc->Handle = (HANDLE)Alloc.bo;
     }