diff --git a/OvmfPkg/Sec/FindPeiCore.c b/OvmfPkg/Sec/FindPeiCore.c
index 01cd70f5ba..f74872aa16 100644
--- a/OvmfPkg/Sec/FindPeiCore.c
+++ b/OvmfPkg/Sec/FindPeiCore.c
@@ -217,8 +217,6 @@ FindFfsFileAndSection (
       return Status;
     }
   }
-
-  return EFI_NOT_FOUND;
 }
 
 
diff --git a/OvmfPkg/Sec/SecMain.c b/OvmfPkg/Sec/SecMain.c
index 58da92b086..d6c6f42722 100644
--- a/OvmfPkg/Sec/SecMain.c
+++ b/OvmfPkg/Sec/SecMain.c
@@ -127,7 +127,7 @@ SecCoreStartupWithStack (
   FindPeiCoreEntryPoint (&BootFv, &PeiCoreEntryPoint);
 
   SecCoreData->BootFirmwareVolumeBase = BootFv;
-  SecCoreData->BootFirmwareVolumeSize = BootFv->FvLength;
+  SecCoreData->BootFirmwareVolumeSize = (UINTN) BootFv->FvLength;
 
   if (PeiCoreEntryPoint != NULL) {
     DEBUG ((EFI_D_INFO,