diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py
index f02c0a96748fea..9489473db1f3da 100644
--- a/var/spack/repos/builtin/packages/qt/package.py
+++ b/var/spack/repos/builtin/packages/qt/package.py
@@ -626,6 +626,8 @@ def common_config_args(self):
             use_spack_dep("freetype")
             if spec.satisfies("platform=linux") or spec.satisfies("platform=freebsd"):
                 config_args.append("-fontconfig")
+            # Explicitly disable vulkan to avoid build-time bug; this could be a variant
+            config_args.append("-no-vulkan")
         else:
             config_args.append("-no-freetype")
             config_args.append("-no-gui")
@@ -805,8 +807,7 @@ def configure(self, spec, prefix):
             config_args.extend(["-skip", "wayland"])
 
         if "~location" in spec:
-            if version >= Version("5.15"):
-                config_args.extend(["-skip", "qtlocation"])
+            config_args.extend(["-skip", "qtlocation"])
 
         if IS_WINDOWS:
             config_args.extend(["-skip", "qtspeech"])
diff --git a/var/spack/repos/builtin/packages/scotch/package.py b/var/spack/repos/builtin/packages/scotch/package.py
index 368452face4091..58f3d11565cc02 100644
--- a/var/spack/repos/builtin/packages/scotch/package.py
+++ b/var/spack/repos/builtin/packages/scotch/package.py
@@ -20,6 +20,7 @@ class Scotch(CMakePackage, MakefilePackage):
 
     maintainers("pghysels")
 
+    version("7.0.7", sha256="02084471d2ca525f8a59b4bb8c607eb5cca452d6a38cf5c89f5f92f7edc1a5b5")
     version("7.0.4", sha256="8ef4719d6a3356e9c4ca7fefd7e2ac40deb69779a5c116f44da75d13b3d2c2c3")
     version("7.0.3", sha256="5b5351f0ffd6fcae9ae7eafeccaa5a25602845b9ffd1afb104db932dd4d4f3c5")
     version("7.0.1", sha256="0618e9bc33c02172ea7351600fce4fccd32fe00b3359c4aabb5e415f17c06fed")
@@ -87,7 +88,7 @@ class Scotch(CMakePackage, MakefilePackage):
 
     # https://github.com/ufs-community/ufs-weather-model/pull/2650
     # https://github.com/spack/spack-packages/issues/161
-    conflicts("@oneapi")
+    conflicts("%oneapi")
 
     parallel = False