diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b9d8f504..f156196f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -74,7 +74,9 @@ jobs:
 
     - name: Install macOS Tools
       if: runner.os == 'macOS'
-      run: brew install gcovr ninja
+      run: |
+        brew update
+        brew install gcovr ninja
 
     - name: Install OpenCppCoverage and add to PATH
       uses: nick-fields/retry@v2
@@ -208,6 +210,7 @@ jobs:
     - name: Install macOS Dependencies
       if: runner.os == 'macOS'
       run: |
+        brew update
         brew install llvm
         echo /usr/local/opt/llvm/bin >> $GITHUB_PATH
 
diff --git a/src/SFML/Window/OSX/SFKeyboardModifiersHelper.mm b/src/SFML/Window/OSX/SFKeyboardModifiersHelper.mm
index 73682e68..90dd5204 100644
--- a/src/SFML/Window/OSX/SFKeyboardModifiersHelper.mm
+++ b/src/SFML/Window/OSX/SFKeyboardModifiersHelper.mm
@@ -70,9 +70,12 @@ struct ModifiersState
 // Global Variables
 ////////////////////////////////////////////////////////////
 
+namespace
+{
 /// Share 'modifiers' state with all windows to correctly fire pressed/released events
-static ModifiersState state;
-static BOOL           isStateInitialized = NO;
+ModifiersState state;
+BOOL           isStateInitialized = NO;
+}
 
 
 ////////////////////////////////////////////////////////////
diff --git a/test/System/FileInputStream.test.cpp b/test/System/FileInputStream.test.cpp
index 384d51fa..6b2a7d69 100644
--- a/test/System/FileInputStream.test.cpp
+++ b/test/System/FileInputStream.test.cpp
@@ -14,7 +14,9 @@ static_assert(!std::is_copy_assignable_v<sf::FileInputStream>);
 static_assert(std::is_nothrow_move_constructible_v<sf::FileInputStream>);
 static_assert(std::is_nothrow_move_assignable_v<sf::FileInputStream>);
 
-static std::string getTemporaryFilePath()
+namespace
+{
+std::string getTemporaryFilePath()
 {
     static int counter = 0;
 
@@ -63,6 +65,7 @@ public:
         return m_path;
     }
 };
+} // namespace
 
 TEST_CASE("[System] sf::FileInputStream")
 {