diff --git a/.github/workflows/fnx.yaml b/.github/workflows/fnx.yaml
index 205a469dff5..4bb10c3ebf9 100644
--- a/.github/workflows/fnx.yaml
+++ b/.github/workflows/fnx.yaml
@@ -19,13 +19,13 @@ jobs:
       fail-fast: true
       matrix:
         include:
-          - os: macos-13
+          - os: macos-15-intel
             token: osx.editor
             build: scons -j2 platform=osx tools=yes target=release_debug verbose=yes
-          - os: macos-13
+          - os: macos-15-intel
             token: osx.editor.headless
             build: scons -j2 platform=server tools=yes target=release_debug verbose=yes
-          - os: macos-13
+          - os: macos-15-intel
             token: ios.release
             build: |
               mkdir iphone
diff --git a/core/project_settings.cpp b/core/project_settings.cpp
index 92081fb7986..4594a2f4758 100644
--- a/core/project_settings.cpp
+++ b/core/project_settings.cpp
@@ -51,11 +51,12 @@ ProjectSettings *ProjectSettings::get_singleton() {
 }
 
 String ProjectSettings::get_resource_path() const {
-
+	_THREAD_SAFE_METHOD_
 	return resource_path;
 };
 
 String ProjectSettings::localize_path(const String &p_path) const {
+	_THREAD_SAFE_METHOD_
 
 	if (resource_path == "")
 		return p_path; //not initialized yet
@@ -127,6 +128,7 @@ void ProjectSettings::set_restart_if_changed(const String &p_name, bool p_restar
 }
 
 String ProjectSettings::globalize_path(const String &p_path) const {
+	_THREAD_SAFE_METHOD_
 
 	if (p_path.begins_with("res://")) {
 
diff --git a/platform/osx/detect.py b/platform/osx/detect.py
index 409c0e11957..71f00127d69 100644
--- a/platform/osx/detect.py
+++ b/platform/osx/detect.py
@@ -176,8 +176,6 @@ def configure(env):
             "-framework",
             "OpenGL",
             "-framework",
-            "AGL",
-            "-framework",
             "AudioUnit",
             "-framework",
             "CoreAudio",
diff --git a/thirdparty/embree/kernels/geometry/pointi.h b/thirdparty/embree/kernels/geometry/pointi.h
index 4ba298e86b6..2fa2d4bd29f 100644
--- a/thirdparty/embree/kernels/geometry/pointi.h
+++ b/thirdparty/embree/kernels/geometry/pointi.h
@@ -217,7 +217,7 @@ namespace embree
     /*! output operator */
     friend __forceinline embree_ostream operator<<(embree_ostream cout, const PointMi& line)
     {
-      return cout << "Line" << M << "i {" << line.v0 << ", " << line.geomID() << ", " << line.primID() << "}";
+      return cout << "Line" << M << "i {"  << ", " << line.geomID() << ", " << line.primID() << "}";
     }
 
    public:
diff --git a/thirdparty/embree/kernels/subdiv/bezier_curve.h b/thirdparty/embree/kernels/subdiv/bezier_curve.h
index c0e78820f8e..444d49359f2 100644
--- a/thirdparty/embree/kernels/subdiv/bezier_curve.h
+++ b/thirdparty/embree/kernels/subdiv/bezier_curve.h
@@ -134,7 +134,7 @@ namespace embree
       }
       
       friend embree_ostream operator<<(embree_ostream cout, const QuadraticBezierCurve& a) {
-        return cout << "QuadraticBezierCurve ( (" << a.u.lower << ", " << a.u.upper << "), " << a.v0 << ", " << a.v1 << ", " << a.v2 << ")";
+        return cout << "QuadraticBezierCurve ( (), " << a.v0 << ", " << a.v1 << ", " << a.v2 << ")";
       }
     };
   
diff --git a/thirdparty/freetype/src/gzip/ftzconf.h b/thirdparty/freetype/src/gzip/ftzconf.h
index 3abf0ba03b0..812766e718b 100644
--- a/thirdparty/freetype/src/gzip/ftzconf.h
+++ b/thirdparty/freetype/src/gzip/ftzconf.h
@@ -215,9 +215,7 @@
 #   define FAR
 #endif
 
-#if !defined(MACOS) && !defined(TARGET_OS_MAC)
 typedef unsigned char  Byte;  /* 8 bits */
-#endif
 typedef unsigned int   uInt;  /* 16 bits or more */
 typedef unsigned long  uLong; /* 32 bits or more */
 
diff --git a/thirdparty/libpng/pngpriv.h b/thirdparty/libpng/pngpriv.h
index 57e1bf989ba..78fd2ff1724 100644
--- a/thirdparty/libpng/pngpriv.h
+++ b/thirdparty/libpng/pngpriv.h
@@ -517,18 +517,8 @@
     */
 #  include <float.h>
 
-#  if (defined(__MWERKS__) && defined(macintosh)) || defined(applec) || \
-    defined(THINK_C) || defined(__SC__) || defined(TARGET_OS_MAC)
-   /* We need to check that <math.h> hasn't already been included earlier
-    * as it seems it doesn't agree with <fp.h>, yet we should really use
-    * <fp.h> if possible.
-    */
-#    if !defined(__MATH_H__) && !defined(__MATH_H) && !defined(__cmath__)
-#      include <fp.h>
-#    endif
-#  else
+
 #    include <math.h>
-#  endif
 #  if defined(_AMIGA) && defined(__SASC) && defined(_M68881)
    /* Amiga SAS/C: We must include builtin FPU functions when compiling using
     * MATH=68881
diff --git a/thirdparty/zlib/zutil.h b/thirdparty/zlib/zutil.h
index b079ea6a80f..9bb43fbf404 100644
--- a/thirdparty/zlib/zutil.h
+++ b/thirdparty/zlib/zutil.h
@@ -130,18 +130,7 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #  endif
 #endif
 
-#if defined(MACOS) || defined(TARGET_OS_MAC)
-#  define OS_CODE  7
-#  ifndef Z_SOLO
-#    if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
-#      include <unix.h> /* for fdopen */
-#    else
-#      ifndef fdopen
-#        define fdopen(fd,mode) NULL /* No fdopen() */
-#      endif
-#    endif
-#  endif
-#endif
+
 
 #ifdef __acorn
 #  define OS_CODE 13