diff --git a/py/selenium/webdriver/support/event_firing_webdriver.py b/py/selenium/webdriver/support/event_firing_webdriver.py
index 888407e06c782..7044c68575bbe 100644
--- a/py/selenium/webdriver/support/event_firing_webdriver.py
+++ b/py/selenium/webdriver/support/event_firing_webdriver.py
@@ -73,7 +73,8 @@ def after_navigate_to(self, url, driver):
         if not isinstance(event_listener, AbstractEventListener):
             raise WebDriverException("Event listener must be a subclass of AbstractEventListener")
         self._driver = driver
-        self._driver._wrap_value = self._wrap_value
+        self._original_wrap_value = getattr(self._driver, "_wrap_value", None)
+        setattr(self._driver, "_wrap_value", self._wrap_value)
         self._listener = event_listener
 
     @property
diff --git a/py/selenium/webdriver/webkitgtk/service.py b/py/selenium/webdriver/webkitgtk/service.py
index 5e7d181aa2dcc..66d6de789c394 100644
--- a/py/selenium/webdriver/webkitgtk/service.py
+++ b/py/selenium/webdriver/webkitgtk/service.py
@@ -22,7 +22,7 @@
 
 from selenium.webdriver.common import service
 
-DEFAULT_EXECUTABLE_PATH: str = shutil.which("WebKitWebDriver")
+DEFAULT_EXECUTABLE_PATH: Optional[str] = shutil.which("WebKitWebDriver")
 
 
 class Service(service.Service):
@@ -40,7 +40,7 @@ class Service(service.Service):
 
     def __init__(
         self,
-        executable_path: str = DEFAULT_EXECUTABLE_PATH,
+        executable_path: Optional[str] = DEFAULT_EXECUTABLE_PATH,
         port: int = 0,
         log_path: Optional[str] = None,
         log_output: Optional[str] = None,
@@ -49,15 +49,17 @@ def __init__(
         **kwargs,
     ) -> None:
         self._service_args = list(service_args or [])
+        log_file = None
+        output_file = None
         if log_path is not None:
             warnings.warn("log_path is deprecated, use log_output instead", DeprecationWarning, stacklevel=2)
-            log_path = open(log_path, "wb")
-        log_output = open(log_output, "wb") if log_output else None
-
+            log_file = open(log_path, "wb")
+        if log_output:
+            output_file = open(log_output, "wb")
         super().__init__(
             executable_path=executable_path,
             port=port,
-            log_output=log_path or log_output,
+            log_output=log_file or output_file,
             env=env,
             **kwargs,
         )
diff --git a/py/selenium/webdriver/wpewebkit/service.py b/py/selenium/webdriver/wpewebkit/service.py
index 2941633aa91bb..2586ae6619f0f 100644
--- a/py/selenium/webdriver/wpewebkit/service.py
+++ b/py/selenium/webdriver/wpewebkit/service.py
@@ -39,7 +39,7 @@ class Service(service.Service):
 
     def __init__(
         self,
-        executable_path: str = DEFAULT_EXECUTABLE_PATH,
+        executable_path: Optional[str] = DEFAULT_EXECUTABLE_PATH,
         port: int = 0,
         log_output: Optional[str] = None,
         service_args: Optional[Sequence[str]] = None,