diff --git a/src/shaders/icc.c b/src/shaders/icc.c
index 0a50e660239439979768f0de766849840287cfcd..d2a31c95d6de5a937261844de389ddc4bdfdee44 100644
--- a/src/shaders/icc.c
+++ b/src/shaders/icc.c
@@ -180,6 +180,7 @@ static bool detect_csp(struct pl_icc_object_t *icc)
         const struct pl_raw_primaries *raw = pl_raw_primaries_get(prim);
         if (!icc->csp.primaries && pl_raw_primaries_similar(raw, measured)) {
             icc->containing_primaries = icc->csp.primaries = prim;
+            best = raw;
             break;
         }
 
diff --git a/src/vulkan/common.h b/src/vulkan/common.h
index 31b309e7e1c8f557d78608b23c11019756c79782..71a41c25fc7f11cdbf8d8024ec1bb0760eb89c14 100644
--- a/src/vulkan/common.h
+++ b/src/vulkan/common.h
@@ -19,7 +19,9 @@
 
 #define VK_NO_PROTOTYPES
 #define VK_ENABLE_BETA_EXTENSIONS // for VK_KHR_portability_subset
+#ifdef __APPLE__
 #define VK_USE_PLATFORM_METAL_EXT
+#endif
 
 #include "../common.h"
 #include "../log.h"