diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
index 791539f3..51b78ccb 100644
--- a/.github/workflows/build_wheels.yml
+++ b/.github/workflows/build_wheels.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ macos-12, macos-13, macos-13-xlarge, macos-14, ubuntu-latest, windows-latest ]
+        os: [ macos-12, macos-14, ubuntu-latest, windows-latest ]
 
     steps:
       - uses: fortran-lang/setup-fortran@main
@@ -17,9 +17,9 @@ jobs:
         id: setup-fortran
         with:
           compiler: gcc
-          version: 13
+          version: 14
 
-      - run: ln -s $(which gfortran-12) /usr/local/bin/gfortran
+      - run: ln -s $(which gfortran-14) /usr/local/bin/gfortran
         if: matrix.os != 'windows-latest'
 
       - run: gfortran --version
@@ -33,21 +33,22 @@ jobs:
       - name: Install cibuildwheel
         run: python -m pip install cibuildwheel
 
-      - name: Build macos-13 wheels
-        if: matrix.os == 'macos-13' || matrix.os == 'macos-13-xlarge'
-        env:
-          MACOSX_DEPLOYMENT_TARGET: 13
-          CIBW_BUILD: cp311-*
-          CIBW_SKIP: pp*
-          CIBW_BUILD_VERBOSITY: 1
-        run: python -m cibuildwheel --output-dir wheelhouse
+#      - name: Build macos-13 wheels
+#        if: matrix.os == 'macos-13' || matrix.os == 'macos-13-xlarge'
+#        env:
+#          MACOSX_DEPLOYMENT_TARGET: 13
+#          CIBW_BUILD: cp311-*
+#          CIBW_SKIP: pp*
+#          CIBW_BUILD_VERBOSITY: 1
+#        run: python -m cibuildwheel --output-dir wheelhouse
 
       - name: Build macos-12 wheels
         if: matrix.os == 'macos-12'
         env:
           # all cp3xx, since old macs seem to only use osx 12+ builds if this is set not "none"
           # see consistency with get_tag() in setup.py
-          MACOSX_DEPLOYMENT_TARGET: 12
+          MACOSX_DEPLOYMENT_TARGET: 10.15
+          CIBW_BUILD: cp311-*
           CIBW_SKIP: pp*
           CIBW_BUILD_VERBOSITY: 1
         run: python -m cibuildwheel --output-dir wheelhouse
@@ -55,7 +56,7 @@ jobs:
       - name: Build wheels
         if: matrix.os == 'macos-14' || matrix.os == 'ubuntu-latest' || matrix.os == 'windows-latest'
         env:
-          MACOSX_DEPLOYMENT_TARGET: 14
+          MACOSX_DEPLOYMENT_TARGET: 12
           CIBW_BUILD: cp311-*
           CIBW_SKIP: pp* *-win32 *-manylinux_i686 *musllinux*
           CIBW_BUILD_VERBOSITY: 1
@@ -83,7 +84,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.10"
+          python-version: "3.11"
           cache: pip
           cache-dependency-path: "setup.py"
 
diff --git a/camb/__init__.py b/camb/__init__.py
index f253bcb7..edf82152 100644
--- a/camb/__init__.py
+++ b/camb/__init__.py
@@ -8,7 +8,7 @@
 __author__ = "Antony Lewis"
 __contact__ = "antony at cosmologist dot info"
 __url__ = "https://camb.readthedocs.io"
-__version__ = "1.5.8"
+__version__ = "1.5.8.1"
 
 from . import baseconfig
 
diff --git a/fortran/Makefile b/fortran/Makefile
index d5ffb621..b69a081d 100644
--- a/fortran/Makefile
+++ b/fortran/Makefile
@@ -96,7 +96,7 @@ COMMON_FFLAGS = -MMD -cpp -ffree-line-length-none -fmax-errors=4 -fopenmp
 FFLAGS = -O3 $(COMMON_FFLAGS)
 DEBUGFLAGS = -g -fbacktrace -ffpe-trap=invalid,overflow,zero -fbounds-check $(COMMON_FFLAGS)
 ifeq ($(shell uname -s),Darwin)
-SFFLAGS = -dynamiclib -static-libgfortran #-fpic
+SFFLAGS = -dynamiclib -static-libgfortran -static-libgcc -static-libquadmath #-fpic
 else
 SFFLAGS = -shared -fpic
 endif
diff --git a/fortran/config.f90 b/fortran/config.f90
index 398ca84b..b9f1f5a4 100644
--- a/fortran/config.f90
+++ b/fortran/config.f90
@@ -3,7 +3,7 @@ module config
     use constants, only: const_twopi
     implicit none
 
-    character(LEN=*), parameter :: version = '1.5.7'
+    character(LEN=*), parameter :: version = '1.5.8.1'
 
     integer :: FeedbackLevel = 0 !if >0 print out useful information about the model
 
diff --git a/setup.py b/setup.py
index 6411a635..446bc707 100644
--- a/setup.py
+++ b/setup.py
@@ -256,8 +256,8 @@ def finalize_options(self):
 
     def get_tag(self):
         _, _, plat = super().get_tag()
-        if "osx_12" in plat:
-            return _, _, plat
+        # if "osx_12" in plat:
+        #     return _, _, plat
         return "py3", "none", plat