diff --git a/kittens/unicode_input/main.py b/kittens/unicode_input/main.py
index 6f92adace..7b19f0448 100644
--- a/kittens/unicode_input/main.py
+++ b/kittens/unicode_input/main.py
@@ -300,7 +300,7 @@ class UnicodeInput(Handler):
     def update_codepoints(self):
         codepoints = None
         if self.mode is HEX:
-            q: Tuple[str, Optional[Union[str, Sequence[int]]]] = self.mode, None
+            q: Tuple[str, Optional[Union[str, Sequence[int]]]] = (self.mode, None)
             codepoints = self.recent
         elif self.mode is EMOTICONS:
             q = self.mode, None
diff --git a/kitty/boss.py b/kitty/boss.py
index ebd2573b6..c86a0b1dd 100644
--- a/kitty/boss.py
+++ b/kitty/boss.py
@@ -209,14 +209,14 @@ class Boss:
                 if w is not None:
                     yield w
             return
-        if field == 'env':
+        if field != 'env':
+            pat: MatchPatternType = re.compile(exp)
+        else:
             kp, vp = exp.partition('=')[::2]
             if vp:
-                pat: MatchPatternType = re.compile(kp), re.compile(vp)
+                pat = re.compile(kp), re.compile(vp)
             else:
                 pat = re.compile(kp), None
-        else:
-            pat = re.compile(exp)
         for window in self.all_windows:
             if window.matches(field, pat):
                 yield window
diff --git a/kitty/rc/scroll_window.py b/kitty/rc/scroll_window.py
index 3699a7ce4..dc8ed695a 100644
--- a/kitty/rc/scroll_window.py
+++ b/kitty/rc/scroll_window.py
@@ -35,7 +35,7 @@ class ScrollWindow(RemoteCommand):
 
     def message_to_kitty(self, global_opts: RCOptions, opts: 'CLIOptions', args: ArgsType) -> PayloadType:
         amt = args[0]
-        amount: Tuple[Union[str, int], Optional[str]] = amt, None
+        amount: Tuple[Union[str, int], Optional[str]] = (amt, None)
         if amt not in ('start', 'end'):
             pages = 'p' in amt
             amt = amt.replace('p', '')