diff --git a/EmulatorPkg/Include/Protocol/EmuThunk.h b/EmulatorPkg/Include/Protocol/EmuThunk.h
index ae0dbc95c9..7902d93c6f 100644
--- a/EmulatorPkg/Include/Protocol/EmuThunk.h
+++ b/EmulatorPkg/Include/Protocol/EmuThunk.h
@@ -96,7 +96,7 @@ EFI_STATUS
 typedef
 VOID
 (EFIAPI *EMU_PE_COFF_RELOCATE_EXTRA_ACTION)(
-  IN OUT UEFI_IMAGE_LOADER_IMAGE_CONTEXT  *ImageContext
+  IN CONST UEFI_IMAGE_LOADER_IMAGE_CONTEXT  *ImageContext
   );
 
 typedef
diff --git a/EmulatorPkg/Library/DxeEmuUefiImageExtraActionLib/DxeEmuUefiImageExtraActionLib.c b/EmulatorPkg/Library/DxeEmuUefiImageExtraActionLib/DxeEmuUefiImageExtraActionLib.c
index 246c4d0068..8f8e6f76e4 100644
--- a/EmulatorPkg/Library/DxeEmuUefiImageExtraActionLib/DxeEmuUefiImageExtraActionLib.c
+++ b/EmulatorPkg/Library/DxeEmuUefiImageExtraActionLib/DxeEmuUefiImageExtraActionLib.c
@@ -64,7 +64,7 @@ DxeEmuUefiImageLibExtraActionConstructor (
 VOID
 EFIAPI
 UefiImageLoaderRelocateImageExtraAction (
-  IN OUT UEFI_IMAGE_LOADER_IMAGE_CONTEXT  *ImageContext
+  IN CONST UEFI_IMAGE_LOADER_IMAGE_CONTEXT  *ImageContext
   )
 {
   if (mThunk != NULL) {
diff --git a/EmulatorPkg/Library/PeiEmuUefiImageExtraActionLib/PeiEmuUefiImageExtraActionLib.c b/EmulatorPkg/Library/PeiEmuUefiImageExtraActionLib/PeiEmuUefiImageExtraActionLib.c
index ce19922aec..9580688acd 100644
--- a/EmulatorPkg/Library/PeiEmuUefiImageExtraActionLib/PeiEmuUefiImageExtraActionLib.c
+++ b/EmulatorPkg/Library/PeiEmuUefiImageExtraActionLib/PeiEmuUefiImageExtraActionLib.c
@@ -67,7 +67,7 @@ EmuUefiImageGetThunkStucture (
 VOID
 EFIAPI
 UefiImageLoaderRelocateImageExtraAction (
-  IN OUT UEFI_IMAGE_LOADER_IMAGE_CONTEXT  *ImageContext
+  IN CONST UEFI_IMAGE_LOADER_IMAGE_CONTEXT  *ImageContext
   )
 {
   if (EMU_MAGIC_PAGE ()->Thunk == NULL) {
diff --git a/EmulatorPkg/Unix/Host/Gasket.h b/EmulatorPkg/Unix/Host/Gasket.h
index 6ebac74445..005a9e6cdb 100644
--- a/EmulatorPkg/Unix/Host/Gasket.h
+++ b/EmulatorPkg/Unix/Host/Gasket.h
@@ -76,7 +76,7 @@ GasketSecUefiImageGetEntryPoint (
 VOID
 EFIAPI
 GasketSecUefiImageRelocateImageExtraAction (
-  IN OUT UEFI_IMAGE_LOADER_IMAGE_CONTEXT  *ImageContext
+  IN CONST UEFI_IMAGE_LOADER_IMAGE_CONTEXT  *ImageContext
   );
 
 VOID
diff --git a/EmulatorPkg/Unix/Host/Host.c b/EmulatorPkg/Unix/Host/Host.c
index aa1e792074..b8faa54fdf 100644
--- a/EmulatorPkg/Unix/Host/Host.c
+++ b/EmulatorPkg/Unix/Host/Host.c
@@ -746,12 +746,15 @@ SecUefiImageGetEntryPoint (
   EFI_STATUS                      Status;
   UEFI_IMAGE_LOADER_IMAGE_CONTEXT ImageContext;
 
-  Status                  = UefiImageInitializeContext (&ImageContext, Pe32Data, Pe32Size);
+  Status = UefiImageInitializeContext (&ImageContext, Pe32Data, Pe32Size);
   if (EFI_ERROR (Status)) {
     return Status;
   }
-
-  // FIXME: Why cannot the Image be in-place already?
+  //
+  // FIXME: This modifies the FD data (which is not possible on real platforms)
+  //        and thus re-relocation (i.e., PEIM shadowing) fails badly due to
+  //        not updating ImageBase.
+  //
   Status = UefiImageRelocateImageInplaceForExecution (&ImageContext);
   if (EFI_ERROR (Status)) {
     return Status;
@@ -872,7 +875,7 @@ IsPdbFile (
 
 void
 PrintLoadAddress (
-  IN UEFI_IMAGE_LOADER_IMAGE_CONTEXT       *ImageContext
+  IN CONST UEFI_IMAGE_LOADER_IMAGE_CONTEXT       *ImageContext
   )
 {
   EFI_STATUS                   Status;
@@ -925,7 +928,7 @@ SecGdbScriptBreak (
 **/
 VOID
 GdbScriptAddImage (
-  IN OUT UEFI_IMAGE_LOADER_IMAGE_CONTEXT      *ImageContext
+  IN CONST UEFI_IMAGE_LOADER_IMAGE_CONTEXT      *ImageContext
   )
 {
   EFI_STATUS  Status;
@@ -934,7 +937,7 @@ GdbScriptAddImage (
 
   PrintLoadAddress (ImageContext);
 
-  Status = UefiImageGetSymbolsPath ((ImageContext, &PdbPath,) &PdbPathSize);
+  Status = UefiImageGetSymbolsPath (ImageContext, &PdbPath, &PdbPathSize);
   if (EFI_ERROR (Status)) {
     return;
   }
@@ -987,7 +990,7 @@ GdbScriptAddImage (
 VOID
 EFIAPI
 SecUefiImageRelocateImageExtraAction (
-  IN OUT UEFI_IMAGE_LOADER_IMAGE_CONTEXT      *ImageContext
+  IN CONST UEFI_IMAGE_LOADER_IMAGE_CONTEXT      *ImageContext
   )
 {
   GdbScriptAddImage (ImageContext);
diff --git a/EmulatorPkg/Unix/Host/Host.h b/EmulatorPkg/Unix/Host/Host.h
index a238f57259..f564ff19e0 100644
--- a/EmulatorPkg/Unix/Host/Host.h
+++ b/EmulatorPkg/Unix/Host/Host.h
@@ -267,7 +267,7 @@ SecUefiImageGetEntryPoint (
 VOID
 EFIAPI
 SecUefiImageRelocateImageExtraAction (
-  IN OUT UEFI_IMAGE_LOADER_IMAGE_CONTEXT  *ImageContext
+  IN CONST UEFI_IMAGE_LOADER_IMAGE_CONTEXT  *ImageContext
   );
 
 VOID
diff --git a/EmulatorPkg/Win/Host/WinHost.c b/EmulatorPkg/Win/Host/WinHost.c
index 1e272bd226..041a32a928 100644
--- a/EmulatorPkg/Win/Host/WinHost.c
+++ b/EmulatorPkg/Win/Host/WinHost.c
@@ -801,37 +801,21 @@ SecUefiImageGetEntryPoint (
   IN OUT VOID   **EntryPoint
   )
 {
-  EFI_STATUS                       Status;
-  UEFI_IMAGE_LOADER_IMAGE_CONTEXT  ImageContext;
-  VOID                             *Dest;
-  UINT32                           DestSize;
+  EFI_STATUS                      Status;
+  UEFI_IMAGE_LOADER_IMAGE_CONTEXT ImageContext;
 
-  Status                  = UefiImageInitializeContext (&ImageContext, Pe32Data, Pe32Size);
+  Status = UefiImageInitializeContext (&ImageContext, Pe32Data, Pe32Size);
   if (EFI_ERROR (Status)) {
     return Status;
   }
-
   //
-  // Allocate space in NT (not emulator) memory with ReadWrite and Execute attribute.
-  // Extra space is for alignment
+  // FIXME: This modifies the FD data (which is not possible on real platforms)
+  //        and thus re-relocation (i.e., PEIM shadowing) fails badly due to
+  //        not updating ImageBase.
   //
-  Status = UefiImageLoaderGetDestinationSize(&ImageContext, &DestSize);
-  if (EFI_ERROR (Status)) {
-    return Status;
-  }
-
-  Dest = VirtualAlloc (NULL, (SIZE_T) DestSize, MEM_COMMIT, PAGE_EXECUTE_READWRITE);
-  if (Dest == NULL) {
-    return EFI_OUT_OF_RESOURCES;
-  }
-
-  Status = UefiImageLoadImage (&ImageContext, Dest, DestSize);
-  if (EFI_ERROR (Status)) {
-    return Status;
-  }
-
-  Status = UefiImageRelocateImage (&ImageContext, (UINTN) Dest, NULL, 0);
-  if (EFI_ERROR (Status)) {
+  Status = UefiImageRelocateImageInplaceForExecution (&ImageContext);
+  if (RETURN_ERROR (Status)) {
+    DEBUG_RAISE ();
     return Status;
   }
 
@@ -842,8 +826,8 @@ SecUefiImageGetEntryPoint (
 
 CHAR16 *
 AsciiToUnicode (
-  IN  CHAR8  *Ascii,
-  IN  UINTN  *StrLen OPTIONAL
+  IN  CONST CHAR8  *Ascii,
+  IN  UINTN        *StrLen OPTIONAL
   )
 
 /*++
@@ -930,8 +914,8 @@ Returns:
 --*/
 EFI_STATUS
 AddModHandle (
-  IN  UEFI_IMAGE_LOADER_IMAGE_CONTEXT      *ImageContext,
-  IN  VOID                          *ModHandle
+  IN  CONST CHAR8  *PdbPointer,
+  IN  VOID         *ModHandle
   )
 
 {
@@ -959,11 +943,11 @@ AddModHandle (
       // Make a copy of the stirng and store the ModHandle
       //
       Handle            = GetProcessHeap ();
-      Size              = AsciiStrLen (ImageContext->PdbPointer) + 1;
+      Size              = AsciiStrLen (PdbPointer) + 1;
       Array->PdbPointer = HeapAlloc (Handle, HEAP_ZERO_MEMORY, Size);
       ASSERT (Array->PdbPointer != NULL);
 
-      AsciiStrCpyS (Array->PdbPointer, Size, ImageContext->PdbPointer);
+      AsciiStrCpyS (Array->PdbPointer, Size, PdbPointer);
       Array->ModHandle = ModHandle;
       return EFI_SUCCESS;
     }
@@ -994,7 +978,7 @@ AddModHandle (
     return EFI_OUT_OF_RESOURCES;
   }
 
-  return AddModHandle (ImageContext, ModHandle);
+  return AddModHandle (PdbPointer, ModHandle);
 }
 
 /**
@@ -1007,13 +991,13 @@ AddModHandle (
 **/
 VOID *
 RemoveModHandle (
-  IN  UEFI_IMAGE_LOADER_IMAGE_CONTEXT      *ImageContext
+  IN  CONST CHAR8  *PdbPointer
   )
 {
   UINTN                   Index;
   PDB_NAME_TO_MOD_HANDLE  *Array;
 
-  if (ImageContext->PdbPointer == NULL) {
+  if (PdbPointer == NULL) {
     //
     // If no PDB pointer there is no ModHandle so return NULL
     //
@@ -1022,7 +1006,7 @@ RemoveModHandle (
 
   Array = mPdbNameModHandleArray;
   for (Index = 0; Index < mPdbNameModHandleArraySize; Index++, Array++) {
-    if ((Array->PdbPointer != NULL) && (AsciiStrCmp (Array->PdbPointer, ImageContext->PdbPointer) == 0)) {
+    if ((Array->PdbPointer != NULL) && (AsciiStrCmp (Array->PdbPointer, PdbPointer) == 0)) {
       //
       // If you find a match return it and delete the entry
       //
@@ -1046,6 +1030,8 @@ UefiImageLoaderRelocateImageExtraAction (
   CHAR16      *DllFileName;
   HMODULE     Library;
   UINTN       Index;
+  CONST CHAR8 *PdbPointer;
+  UINT32      PdbPointerSize;
 
   ASSERT (ImageContext != NULL);
   //
@@ -1059,16 +1045,22 @@ UefiImageLoaderRelocateImageExtraAction (
 
   DllEntryPoint = NULL;
 
+  Status = UefiImageGetSymbolsPath (ImageContext, &PdbPointer, &PdbPointerSize);
+  if (RETURN_ERROR (Status)) {
+    PdbPointer     = NULL;
+    PdbPointerSize = 0;
+  }
+
   //
   // Load the DLL if it's not an EBC image.
   //
-  if ((ImageContext->PdbPointer != NULL) &&
+  if ((PdbPointer != NULL) &&
       (UefiImageGetMachine (ImageContext) != EFI_IMAGE_MACHINE_EBC))
   {
     //
     // Convert filename from ASCII to Unicode
     //
-    DllFileName = AsciiToUnicode (ImageContext->PdbPointer, &Index);
+    DllFileName = AsciiToUnicode (PdbPointer, &Index);
 
     //
     // Check that we have a valid filename
@@ -1105,23 +1097,22 @@ UefiImageLoaderRelocateImageExtraAction (
       // checking as the we can point to the PE32 image loaded by Tiano. This
       // step is only needed for source level debugging
       //
-      // FIXME: Fix ImageBase too
       DllEntryPoint = (VOID *)(UINTN)GetProcAddress (Library, "InitializeDriver");
     }
 
     if ((Library != NULL) && (DllEntryPoint != NULL)) {
-      Status = AddModHandle (ImageContext, Library);
+      Status = AddModHandle (PdbPointer, Library);
       if (Status == EFI_ALREADY_STARTED) {
         //
         // If the DLL has already been loaded before, then this instance of the DLL can not be debugged.
         //
-        ImageContext->PdbPointer = NULL;
+        PdbPointer = NULL;
         SecPrint ("WARNING: DLL already loaded.  No source level debug %S.\n\r", DllFileName);
       } else {
         //
         // This DLL is not already loaded, so source level debugging is supported.
         //
-        ImageContext->EntryPoint = (EFI_PHYSICAL_ADDRESS)(UINTN)DllEntryPoint;
+        ImageContext->ImageBuffer = (VOID *)((UINTN)DllEntryPoint - UefiImageGetEntryPointAddress (ImageContext));
         SecPrint ("LoadLibraryEx (\n\r  %S,\n\r  NULL, DONT_RESOLVE_DLL_REFERENCES)\n\r", DllFileName);
       }
     } else {
@@ -1139,13 +1130,22 @@ UefiImageLoaderUnloadImageExtraAction (
   )
 {
   VOID  *ModHandle;
+  RETURN_STATUS  Status;
+  CONST CHAR8    *PdbPointer;
+  UINT32         PdbPointerSize;
 
   ASSERT (ImageContext != NULL);
 
-  ModHandle = RemoveModHandle (ImageContext);
+  Status = UefiImageGetSymbolsPath (ImageContext, &PdbPointer, &PdbPointerSize);
+  if (RETURN_ERROR (Status)) {
+    PdbPointer     = NULL;
+    PdbPointerSize = 0;
+  }
+
+  ModHandle = RemoveModHandle (PdbPointer);
   if (ModHandle != NULL) {
     FreeLibrary (ModHandle);
-    SecPrint ("FreeLibrary (\n\r  %s)\n\r", ImageContext->PdbPointer);
+    SecPrint ("FreeLibrary (\n\r  %s)\n\r", PdbPointer);
   } else {
     SecPrint ("WARNING: Unload image without source level debug\n\r");
   }
diff --git a/MdeModulePkg/Core/Dxe/Image/Image.c b/MdeModulePkg/Core/Dxe/Image/Image.c
index 1df68e22ec..d6ee206809 100644
--- a/MdeModulePkg/Core/Dxe/Image/Image.c
+++ b/MdeModulePkg/Core/Dxe/Image/Image.c
@@ -233,6 +233,9 @@ CoreInitializeImageServices (
   //
   Image = &mCorePrivateImage;
 
+  //
+  // FIXME: This is not a proper solution, because DxeCore may not be XIP
+  //
   Status = UefiImageInitializeContext (
              ImageContext,
              (VOID *) (UINTN) DxeCoreImageBaseAddress,