diff --git a/src/core/src/bootstrap/EnvLayer.py b/src/core/src/bootstrap/EnvLayer.py
index cca08f63..7be9f033 100644
--- a/src/core/src/bootstrap/EnvLayer.py
+++ b/src/core/src/bootstrap/EnvLayer.py
@@ -123,9 +123,9 @@ def __str__(self):
                 print("Error: CalledProcessError.  Command string was: " + e.cmd, file=sys.stdout)
                 print("Error: CalledProcessError.  Command result was: " + (e.output[:-1]).decode('utf8', 'ignore').encode("ascii", "ignore"), file=sys.stdout)
             if no_output:
-                return e.returncode, None
+                return e.return_code, None
             else:
-                return e.returncode, e.output.decode('utf8', 'ignore').encode('ascii', 'ignore')
+                return e.return_code, e.output.decode('utf8', 'ignore').encode('ascii', 'ignore')
         except Exception as error:
             message = "Exception during cmd execution. [Exception={0}][Cmd={1}]".format(repr(error),str(cmd))
             print(message)
diff --git a/src/core/src/core_logic/PatchInstaller.py b/src/core/src/core_logic/PatchInstaller.py
index fc542596..1988d1d6 100644
--- a/src/core/src/core_logic/PatchInstaller.py
+++ b/src/core/src/core_logic/PatchInstaller.py
@@ -43,7 +43,7 @@ def start_installation(self, simulate=False):
                                                   "    Consider re-running the patch installation after a reboot if any packages fail to install due to this.")
             else:
                 self.composite_logger.log_debug("Attempting to reboot the machine prior to patch installation as there is a reboot pending...")
-                reboot_manager.start_reboot_if_required_and_time_available()
+                reboot_manager.start_reboot_if_required_and_time_available(maintenance_window.get_remaining_time_in_minutes(None, False))
 
         # Install Updates
         installed_update_count, update_run_successful, maintenance_window_exceeded = self.install_updates(maintenance_window, package_manager, simulate)
diff --git a/src/core/src/core_logic/RebootManager.py b/src/core/src/core_logic/RebootManager.py
index 3a879724..17fd8393 100644
--- a/src/core/src/core_logic/RebootManager.py
+++ b/src/core/src/core_logic/RebootManager.py
@@ -65,7 +65,7 @@ def start_reboot(self, message="Azure Patch Management initiated a reboot after
                 self.composite_logger.log_debug("Waiting for machine reboot. [ElapsedTimeInMinutes={0}] [MaxTimeInMinutes={1}]".format(str(elapsed_time_in_minutes), str(max_allowable_time_to_reboot_in_minutes)))
                 time.sleep(60)
 
-    def start_reboot_if_required_and_time_available(self, current_time_available, package_manager=None):
+    def start_reboot_if_required_and_time_available(self, current_time_available):
         """ Starts a reboot if required. Happens only at the end of the run if required. """
         self.composite_logger.log("\nReboot Management")
         reboot_pending = self.package_manager.is_reboot_pending()
diff --git a/src/extension/src/manifest.xml b/src/extension/src/manifest.xml
index 20083270..3a4ae62c 100644
--- a/src/extension/src/manifest.xml
+++ b/src/extension/src/manifest.xml
@@ -2,7 +2,7 @@
 <ExtensionImage xmlns="http://schemas.microsoft.com/windowsazure">
   <ProviderNameSpace>Microsoft.CPlat.Core</ProviderNameSpace>
   <Type>LinuxPatchExtension</Type>
-  <Version>1.4.24</Version>
+  <Version>1.4.25</Version>
   <Label>Microsoft Azure VM InGuest Patch Extension for Linux Virtual Machines</Label>
   <HostingResources>VmRole</HostingResources>
   <MediaLink></MediaLink>