diff --git a/nixos/tests/mate-wayland.nix b/nixos/tests/mate-wayland.nix
index e5c96d2af747..73f94ababc49 100644
--- a/nixos/tests/mate-wayland.nix
+++ b/nixos/tests/mate-wayland.nix
@@ -20,8 +20,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
     };
     services.xserver.desktopManager.mate.enableWaylandSession = true;
 
-    hardware.pulseaudio.enable = true;
-
     # Need to switch to a different GPU driver than the default one (-vga std) so that wayfire can launch:
     virtualisation.qemu.options = [ "-vga none -device virtio-gpu-pci" ];
   };
@@ -41,7 +39,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
       with subtest("Check if MATE session components actually start"):
           for i in ["wayfire", "mate-panel", "mate-wayland.sh", "mate-wayland-components.sh"]:
               machine.wait_until_succeeds(f"pgrep -f {i}")
-          machine.wait_for_text('(Applications|Places|System)')
           # It is expected that this applet doesn't work in Wayland
           machine.wait_for_text('WorkspaceSwitcherApplet')
 
diff --git a/pkgs/by-name/gn/gnome-flashback/package.nix b/pkgs/by-name/gn/gnome-flashback/package.nix
index cfd2913d356b..d8dae346f057 100644
--- a/pkgs/by-name/gn/gnome-flashback/package.nix
+++ b/pkgs/by-name/gn/gnome-flashback/package.nix
@@ -202,7 +202,7 @@ stdenv.mkDerivation (finalAttrs: {
       }:
       runCommand "gnome-flashback-${wmName}.target" { } ''
         mkdir -p $out/lib/systemd/user
-        cp -r "${finalAttrs.gnome-flashback}/lib/systemd/user/gnome-session@gnome-flashback-metacity.target.d" \
+        cp -r "${finalAttrs.finalPackage}/lib/systemd/user/gnome-session@gnome-flashback-metacity.target.d" \
           "$out/lib/systemd/user/gnome-session@gnome-flashback-${wmName}.target.d"
       '';