diff --git a/cmake/Options.cmake b/cmake/Options.cmake
index 201bf8c8e1..3db457c734 100644
--- a/cmake/Options.cmake
+++ b/cmake/Options.cmake
@@ -67,7 +67,7 @@ optionx(ENABLE_ASSERTIONS BOOL "If debug assertions should be enabled" DEFAULT $
 
 optionx(ENABLE_CANARY BOOL "If canary features should be enabled" DEFAULT ON)
 
-if(ENABLE_CANARY AND BUILDKITE)
+if(BUILDKITE)
   execute_process(
     COMMAND buildkite-agent meta-data get "canary"
     OUTPUT_VARIABLE DEFAULT_CANARY_REVISION
diff --git a/cmake/tools/SetupCodesign.cmake b/cmake/tools/SetupCodesign.cmake
index adc06382e3..cf8d26776e 100644
--- a/cmake/tools/SetupCodesign.cmake
+++ b/cmake/tools/SetupCodesign.cmake
@@ -55,7 +55,7 @@ if(ENABLE_CODESIGN STREQUAL "ON" OR ENABLE_CODESIGN MATCHES "Darwin")
   if(NOT APPLE_CODESIGN_IDENTITY)
     message(FATAL_ERROR "Code signing is enabled, but no APPLE_CODESIGN_IDENTITY is set.\n"
       "To fix this, either:\n"
-      "  - Set ENABLE_APPLE_CODESIGN=OFF to disable code signing\n"
+      "  - Set ENABLE_CODESIGN=OFF to disable code signing\n"
       "  - Find your identity in your keychain and set APPLE_CODESIGN_IDENTITY to the identity's name\n"
     )
   endif()