diff --git a/WPinternals/Models/Lumia/UEFI/Flash/LumiaFlashAppModel.cs b/WPinternals/Models/Lumia/UEFI/Flash/LumiaFlashAppModel.cs
index 4bec86e..accaa24 100644
--- a/WPinternals/Models/Lumia/UEFI/Flash/LumiaFlashAppModel.cs
+++ b/WPinternals/Models/Lumia/UEFI/Flash/LumiaFlashAppModel.cs
@@ -779,6 +779,14 @@ namespace WPinternals.Models.UEFIApps.Flash
             ExecuteRawMethod(Request);
         }
 
+        // Erases MODEM_FS1 and MODEM_FS2, and restores MODEM_FSG to MODEM_FS1
+        internal void DoFactoryReset()
+        {
+            byte[] Request = new byte[4];
+            ByteOperations.WriteAsciiString(Request, 0, FactoryResetSignature);
+            ExecuteRawMethod(Request);
+        }
+
         internal void EndAsyncFlash()
         {
             byte[] Request = new byte[7];
diff --git a/WPinternals/ViewModels/LumiaUnlockBootViewModel.cs b/WPinternals/ViewModels/LumiaUnlockBootViewModel.cs
index 7b128a1..f2f927e 100644
--- a/WPinternals/ViewModels/LumiaUnlockBootViewModel.cs
+++ b/WPinternals/ViewModels/LumiaUnlockBootViewModel.cs
@@ -261,7 +261,6 @@ namespace WPinternals
                                             await StorePaths();
 
                                             bool AlreadyUnlocked = false;
-                                            LumiaFlashAppModel FlashModel = (LumiaFlashAppModel)PhoneNotifier.CurrentModel;
 
                                             MachineState OriginalState = State;
                                             State = MachineState.LumiaGetGPT; // Stop handling arrival notifications in this screen
diff --git a/WPinternals/ViewModels/LumiaUnlockBootloaderViewModel.cs b/WPinternals/ViewModels/LumiaUnlockBootloaderViewModel.cs
index 8df17a5..4cecebf 100644
--- a/WPinternals/ViewModels/LumiaUnlockBootloaderViewModel.cs
+++ b/WPinternals/ViewModels/LumiaUnlockBootloaderViewModel.cs
@@ -60,7 +60,7 @@ namespace WPinternals
 
                             if (ModernFlashApp)
                             {
-                                FlashModel.SwitchToFlashAppContext();
+                                FlashModel.SwitchToBootManagerContext();
                             }
                             else
                             {