diff --git a/hosts/Khanda/default.nix b/hosts/Khanda/default.nix
index 2bcc29f..8100b5d 100644
--- a/hosts/Khanda/default.nix
+++ b/hosts/Khanda/default.nix
@@ -84,7 +84,6 @@ in
         syncthing = {
           enable = true;
           autostart = true;
-          enableTray = true;
         };
       };
     };
diff --git a/hosts/Khanda/hardware-configuration.nix b/hosts/Khanda/hardware-configuration.nix
index 960c135..61c7e2b 100644
--- a/hosts/Khanda/hardware-configuration.nix
+++ b/hosts/Khanda/hardware-configuration.nix
@@ -76,9 +76,9 @@ in
     ];
 
     kernelParams = [
-      "pci=hpiosize=0"  # Prevent ACPI interrupt storm. See https://github.com/linux-surface/linux-surface/wiki/Surface-Pro-9#acpi-interrupt-storm
-      "iommu=off" # Disable IOMMU, a possible cause of system stuttering
-      ];
+      "pci=hpiosize=0" # Prevent ACPI interrupt storm. See https://github.com/linux-surface/linux-surface/wiki/Surface-Pro-9#acpi-interrupt-storm
+      "nvme_core.default_ps_max_latency_us=0" # Disable NVME powersaving to prevent system stuttering. See https://forums.linuxmint.com/viewtopic.php?t=392387
+    ];
   };
 
   # Configure the main filesystem.
diff --git a/hosts/Shura/default.nix b/hosts/Shura/default.nix
index 0bc780e..2f54330 100644
--- a/hosts/Shura/default.nix
+++ b/hosts/Shura/default.nix
@@ -114,17 +114,11 @@ in
     users = {
       aires = {
         enable = true;
-        services.syncthing = {
-          enable = true;
-          enableTray = false; # Recent versions of STT don't recognize Gnome's tray. Uninstalling for now.
-        };
+        services.syncthing.enable = true;
       };
       gremlin = {
         enable = true;
-        services.syncthing = {
-          enable = true;
-          enableTray = false;
-        };
+        services.syncthing.enable = true;
       };
     };
   };