diff --git a/hm/desktop/audio/default.nix b/hm/desktop/audio/default.nix
index 0e8dc00..12fe088 100644
--- a/hm/desktop/audio/default.nix
+++ b/hm/desktop/audio/default.nix
@@ -37,7 +37,7 @@ in
       "XF86AudioLowerVolume" = "${pactl} set-sink-mute @DEFAULT_SINK@ false; ${pactl} set-sink-volume @DEFAULT_SINK@ -5%";
       "XF86AudioMute" = "${pactl} set-sink-mute @DEFAULT_SINK@ true";
       "${mod}+F8" = "${pactl} suspend-sink @DEFAULT_SINK@ 1; ${pactl} suspend-sink @DEFAULT_SINK@ 0"; # Re-synchronize bluetooth headset
-      "${mod}+F11" = "exec ${pkgs.pavucontrol}/bin/pwvucontrol";
+      "${mod}+F11" = "exec ${lib.getExe pkgs.pwvucontrol}";
       # TODO Find pacmixer?
     };
   };
diff --git a/hm/desktop/lock/default.nix b/hm/desktop/lock/default.nix
index 3a32d6c..37a6820 100644
--- a/hm/desktop/lock/default.nix
+++ b/hm/desktop/lock/default.nix
@@ -80,8 +80,10 @@ in
     stylix.targets.swaylock.enable = false;
     wayland.windowManager.sway.config.keybindings = lib.mkOptionDefault {
       # Turn screen off until activity
-      "${mod}+F1" =
-        ''--release exec ${powerScreen "off"} && ${lib.getExe wayresume} -t0; ${powerScreen "on"}'';
+      "--release ${mod}+F1" = "exec ${pkgs.writeShellScript "tempscreenoff" ''
+        ${powerScreen "off"} && ${lib.getExe wayresume} -t0
+        ${powerScreen "on"}
+      ''}";
       # Toggle to save on buttons
       # TODO Bar indicator
       "${mod}+F5" = "exec --no-startup-id ${pkgs.writeShellScript "swayidle-toggle" ''