diff --git a/.github/workflows/ci_Mac_x64.yml b/.github/workflows/ci_Mac_x64.yml
index 54b771efdc..ff2711dc5b 100644
--- a/.github/workflows/ci_Mac_x64.yml
+++ b/.github/workflows/ci_Mac_x64.yml
@@ -9,7 +9,7 @@ on:
     - cron:  '0 5 * * *'
 
 jobs:
-  gambit_build:
+  standalones_build:
     runs-on: [self-hosted, macOS,x64]
     strategy:
       fail-fast: false
@@ -31,58 +31,87 @@ jobs:
         echo "Configure with cmake"
         cd BUILD
         # Ditching a few backends that don't currently work on Mac
-        cmake -DWITH_MPI=ON -DWITH_HEPMC=ON -DWITH_YODA=ON -DBUILD_FS_MODELS="CMSSM;MSSM;MDM" -Ditch="micromegas_DMsimpVectorMedVectorDM" ..
-    - name: Build scanners
+        cmake -DWITH_MPI=ON -DWITH_HEPMC=ON -DWITH_YODA=ON -Ditch="micromegas_DMsimpVectorMedVectorDM" ..
+    - name: Build standalones
       run: |
-        echo "Build scanners"
+        echo "Test the building of the standalones"
         cd BUILD
-        make -j $(( $(sysctl -n hw.ncpu)/2 )) scanners
-        cmake ..
-    - name: Build Backends for tests
-      run: |
-        echo "Building Backends"
-        cd BUILD
-        #make -j $(( $(sysctl -n hw.ncpu)/2 )) pythia higgssignals nulike ATLAS_FullLikes susyhit heplike superiso
-        make pythia
-        make higgssignals
-        make nulike
-        make ATLAS_FullLikes
-        make susyhit
-        make heplike
-        make superiso
-        make rivet
-        make contur
-        echo "Running cmake again, since this is required for ColliderBit/pythia"
-        cmake ..
-    - name: Build Gambit
-      run: |
-        echo "Build GAMBIT."
-        cd BUILD
-        make -j $(( $(sysctl -n hw.ncpu)/2 )) gambit
-    - name: Test spartan yaml
-      run: |
-        echo "Testing spartan.yaml (with cout printer)"
-        sed -i "" 's/ hdf5/ cout/g' yaml_files/spartan.yaml
-        ./gambit -rf yaml_files/spartan.yaml 
-    - name: CLI test
-      run: |
-        echo "Run the test of gambit help"
-        ./gambit -h
-    - name: WC test
-      run: |
-        echo "Test WC_lite yaml (no printing)"
-        sed -i "" 's/ hdf5/ none/g' yaml_files/WC_lite.yaml
-        ./gambit -f yaml_files/WC_lite.yaml
-    - name: ColliderBit test
-      run: |
-        echo "Test the ColliderBit CMSSM yaml file"
-        ./gambit -f yaml_files/ColliderBit_CMSSM.yaml
-    - name: Build Backends
-      run: |
-        echo "Building all Backends"
-        cd BUILD
-        #make -j $(( $(sysctl -n hw.ncpu)/2 )) backends
-        make backends
+        make standalones
+  
+  #gambit_build:
+  #  runs-on: [self-hosted, macOS,x64]
+  #  strategy:
+  #    fail-fast: false
+  #    matrix:
+  #      arch: [x64]
+  #  defaults:
+  #    run:
+  #      shell: bash -eo pipefail {0}
+  #  steps:
+  #  - name: Checkout
+  #    uses: actions/checkout@v2
+  #  - name: Set up build environment
+  #    run: |
+  #      echo "Set up the build environment"
+  #      mkdir -p BUILD
+  #      cd BUILD
+  #  - name: Configure with cmake
+  #    run: |
+  #      echo "Configure with cmake"
+  #      cd BUILD
+  #      # Ditching a few backends that don't currently work on Mac
+  #      cmake -DWITH_MPI=ON -DWITH_HEPMC=ON -DWITH_YODA=ON -DBUILD_FS_MODELS="CMSSM;MSSM;MDM" -Ditch="micromegas_DMsimpVectorMedVectorDM" ..
+  #  - name: Build scanners
+  #    run: |
+  #      echo "Build scanners"
+  #      cd BUILD
+  #      make -j $(( $(sysctl -n hw.ncpu)/2 )) scanners
+  #      cmake ..
+  #  - name: Build Backends for tests
+  #    run: |
+  #      echo "Building Backends"
+  #      cd BUILD
+  #      #make -j $(( $(sysctl -n hw.ncpu)/2 )) pythia higgssignals nulike ATLAS_FullLikes susyhit heplike superiso
+  #      make pythia
+  #      make higgssignals
+  #      make nulike
+  #      make ATLAS_FullLikes
+  #      make susyhit
+  #      make heplike
+  #      make superiso
+  #      make rivet
+  #      make contur
+  #      echo "Running cmake again, since this is required for ColliderBit/pythia"
+  #      cmake ..
+  #  - name: Build Gambit
+  #    run: |
+  #      echo "Build GAMBIT."
+  #      cd BUILD
+  #      make -j $(( $(sysctl -n hw.ncpu)/2 )) gambit
+  #  - name: Test spartan yaml
+  #    run: |
+  #      echo "Testing spartan.yaml (with cout printer)"
+  #      sed -i "" 's/ hdf5/ cout/g' yaml_files/spartan.yaml
+  #      ./gambit -rf yaml_files/spartan.yaml 
+  #  - name: CLI test
+  #    run: |
+  #      echo "Run the test of gambit help"
+  #      ./gambit -h
+  #  - name: WC test
+  #    run: |
+  #      echo "Test WC_lite yaml (no printing)"
+  #      sed -i "" 's/ hdf5/ none/g' yaml_files/WC_lite.yaml
+  #      ./gambit -f yaml_files/WC_lite.yaml
+  #  - name: ColliderBit test
+  #    run: |
+  #      echo "Test the ColliderBit CMSSM yaml file"
+  #      ./gambit -f yaml_files/ColliderBit_CMSSM.yaml
+  #  - name: Build Backends
+  #    run: |
+  #      echo "Building all Backends"
+  #      cd BUILD
+  #      #make -j $(( $(sysctl -n hw.ncpu)/2 )) backends
+  #      make backends
     #- name: Build standalones
     #  run: |
     #    echo "Test the building of the standalones"
diff --git a/Elements/scripts/elements_extras.py b/Elements/scripts/elements_extras.py
index 1359fa61be..dbdbc40cbc 100644
--- a/Elements/scripts/elements_extras.py
+++ b/Elements/scripts/elements_extras.py
@@ -99,6 +99,8 @@ def main(argv):
         # Extract flag for standalone
         target = args[0]
         isStandalone = 1 if "standalone" in target or "CBS" in target else 0
+        print("HEY Chris. I am in elements_extras.py or target: ", target) # TODO: Chris Chang. Debugging
+        print("isStandalone: " , isStandalone)
 
     except :
         print('Usage: elements_extras.py [flags] <isStandalone>')
diff --git a/cmake/standalones.cmake b/cmake/standalones.cmake
index 48dc26faff..07dc3efebf 100644
--- a/cmake/standalones.cmake
+++ b/cmake/standalones.cmake
@@ -26,9 +26,9 @@
 # Add some programs that use the GAMBIT physics libraries but not GAMBIT itself.
 add_standalone(ExampleBit_A_standalone SOURCES ExampleBit_A/examples/ExampleBit_A_standalone_example.cpp MODULES ExampleBit_A)
 add_standalone(CBS SOURCES ColliderBit/examples/solo.cpp MODULES ColliderBit DEPENDENCIES hepmc pybind11)
-add_standalone(DarkBit_standalone_MSSM SOURCES DarkBit/examples/DarkBit_standalone_MSSM.cpp MODULES DarkBit)
-add_standalone(DarkBit_standalone_ScalarSingletDM_Z2 SOURCES DarkBit/examples/DarkBit_standalone_ScalarSingletDM_Z2.cpp MODULES DarkBit)
-add_standalone(DarkBit_standalone_WIMP SOURCES DarkBit/examples/DarkBit_standalone_WIMP.cpp MODULES DarkBit DEPENDENCIES pybind11)
+add_standalone(DarkBit_standalone_MSSM SOURCES DarkBit/examples/DarkBit_standalone_MSSM.cpp MODULES DarkBit DEPENDENCIES FlavBit_standalone)
+add_standalone(DarkBit_standalone_ScalarSingletDM_Z2 SOURCES DarkBit/examples/DarkBit_standalone_ScalarSingletDM_Z2.cpp MODULES DarkBit DEPENDENCIES FlavBit_standalone)
+add_standalone(DarkBit_standalone_WIMP SOURCES DarkBit/examples/DarkBit_standalone_WIMP.cpp MODULES DarkBit DEPENDENCIES pybind11 FlavBit_standalone)
 add_standalone(3bithit SOURCES DecayBit/examples/3bithit.cpp MODULES DecayBit SpecBit PrecisionBit)
 add_standalone(FlavBit_standalone SOURCES FlavBit/examples/FlavBit_standalone_example.cpp MODULES FlavBit)
 
diff --git a/contrib/heputils/include/HEPUtils/Event.h b/contrib/heputils/include/HEPUtils/Event.h
index acc29dfa23..de4872a1e0 100644
--- a/contrib/heputils/include/HEPUtils/Event.h
+++ b/contrib/heputils/include/HEPUtils/Event.h
@@ -43,7 +43,7 @@ namespace HEPUtils {
     using CSeqBasePtr = std::shared_ptr<const FJNS::ClusterSequence>;
     
     /// Hold the cluster sequences corresponding to jets, to keep them alive
-    std::map<const std::string, CSeqBasePtr> _cseqs;
+    std::map<std::string, CSeqBasePtr> _cseqs;
     
     /// Missing momentum vector
     P4 _pmiss;
@@ -460,7 +460,7 @@ namespace HEPUtils {
       if (_cseqs.find(key) != _cseqs.end() && !_cseqs.empty()) {
 	throw std::runtime_error("Event::set_clusterseq() called for a non-empty jet collection");
       }
-      _cseqs[key] =  cseq;
+      _cseqs[key] = cseq;
     }