diff --git a/.github/workflows/push-master.yml b/.github/workflows/push-master.yml
index 7a14c34f1..0aba60508 100644
--- a/.github/workflows/push-master.yml
+++ b/.github/workflows/push-master.yml
@@ -2,7 +2,6 @@ name: HyperHDR CI Build
 
 on:
   push:
-  pull_request:
 
 env:
     USE_CACHE: "1"
@@ -230,6 +229,7 @@ jobs:
   analyze:
     name: Analyze (CodeQL)
     runs-on: ubuntu-latest
+    if: ( false )    
     permissions:
       actions: read
       contents: read
@@ -243,13 +243,11 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
-        if: ( env.USE_CODEQL == '1' )
         with:
           submodules: true
 
       - name: Run composite CodeQL job for '${{matrix.language}}' language
         uses: ./.github/actions/codeql
-        if: ( env.USE_CODEQL == '1' )
         with:
           language: ${{matrix.language}}
 
diff --git a/.gitmodules b/.gitmodules
index 67e28442d..56e9dacc2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,6 +6,7 @@
 	path = dependencies/external/flatbuffers
 	url = https://github.com/google/flatbuffers
 	branch = master
+	ignore = dirty
 [submodule "dependencies/external/mbedtls"]
 	path = dependencies/external/mbedtls
 	url = https://github.com/ARMmbed/mbedtls
diff --git a/dependencies/CMakeLists.txt b/dependencies/CMakeLists.txt
index d423047b8..fba4b7024 100644
--- a/dependencies/CMakeLists.txt
+++ b/dependencies/CMakeLists.txt
@@ -24,6 +24,11 @@ else ()
 	set(FLATBUFFERS_BUILD_TESTS OFF CACHE BOOL "Build Flatbuffers with tests")	
 	
 	set(CMAKE_POLICY_DEFAULT_CMP0071 NEW)
+
+	file(READ "${CMAKE_CURRENT_SOURCE_DIR}/external/flatbuffers/CMakeLists.txt" FILE_CONTENTS_FLAT)
+	string(REPLACE "-Werror " "-Wno-stringop-overflow " FILE_CONTENTS_FLAT "${FILE_CONTENTS_FLAT}")
+	file(WRITE "${CMAKE_CURRENT_SOURCE_DIR}/external/flatbuffers/CMakeLists.txt" "${FILE_CONTENTS_FLAT}")
+
 	add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/external/flatbuffers)
 
 	if(CMAKE_CROSSCOMPILING)