diff --git a/dev/buildbot/master/master.cfg b/dev/buildbot/master/master.cfg
index aaa076b2..ae0759d0 100644
--- a/dev/buildbot/master/master.cfg
+++ b/dev/buildbot/master/master.cfg
@@ -438,28 +438,19 @@ def fortranFactory(platform=1,bitness=1):
     fortran_folder = "build/wrappers/Fortran/detailed_example" #
     #
     if platform==platformID["windows"]:
-        if bitness==bitnessID["32bit"]:
-            cmake_args = ["-DCOOLPROP_EXTERNC_STATIC_LIBRARY=ON","-G", "\"MinGW Makefiles\""]
-        else:
-            cmake_args = ["-DCOOLPROP_EXTERNC_STATIC_LIBRARY=ON","-G", "\"MinGW Makefiles\""]
+        cmake_args = ["-DCOOLPROP_EXTERNC_LIBRARY=ON","-DCOOLPROP_STATIC_LIBRARY=ON","-G", "\"MinGW Makefiles\""]
         cp_cmd     = "copy /Y *.f90 ..\\..\\..\\build"
         build_cmd  = "gfortran -c -Wall cpinterface.f90 cool_fortran_bind.f90"
         link_cmd   = "gfortran -o main *.o libCoolProp.a -lstdc++"
         exec_cmd   = "main"
     elif platform==platformID["linux"]:
-        if bitness==bitnessID["32bit"]:
-            cmake_args = ["-DCOOLPROP_EXTERNC_STATIC_LIBRARY=ON"]
-        else:
-            cmake_args = ["-DCOOLPROP_EXTERNC_STATIC_LIBRARY=ON"]
+        cmake_args = ["-DCOOLPROP_EXTERNC_LIBRARY=ON","-DCOOLPROP_STATIC_LIBRARY=ON"]
         cp_cmd     = "cp *.f90 ../../../build/"
         build_cmd  = "gfortran -c -Wall cpinterface.f90 cool_fortran_bind.f90"
         link_cmd   = "gfortran -o main *.o libCoolProp.a -lstdc++ -ldl"
         exec_cmd   = "./main"
     elif platform==platformID["osx"]:
-        if bitness==bitnessID["32bit"]:
-            cmake_args = ["-DCOOLPROP_EXTERNC_STATIC_LIBRARY=ON",'-DCMAKE_C_COMPILER="/usr/local/bin/gcc-4.9"','-DCMAKE_CXX_COMPILER="/usr/local/bin/g++-4.9"', '-DCMAKE_VERBOSE_MAKEFILE=ON']
-        else:
-            cmake_args = ["-DCOOLPROP_EXTERNC_STATIC_LIBRARY=ON",'-DCMAKE_C_COMPILER="/usr/local/bin/gcc-4.9"','-DCMAKE_CXX_COMPILER="/usr/local/bin/g++-4.9"', '-DCMAKE_VERBOSE_MAKEFILE=ON']
+        cmake_args = ["-DCOOLPROP_EXTERNC_LIBRARY=ON","-DCOOLPROP_STATIC_LIBRARY=ON",'-DCMAKE_C_COMPILER="/usr/local/bin/gcc-4.9"','-DCMAKE_CXX_COMPILER="/usr/local/bin/g++-4.9"', '-DCMAKE_VERBOSE_MAKEFILE=ON']
         cp_cmd     = "cp *.f90 ../../../build/"
         build_cmd  = "gfortran -c -Wall cpinterface.f90 cool_fortran_bind.f90"
         link_cmd   = "g++-4.9 -o main *.o libCoolProp.a -lstdc++ -ldl -lgfortran"
@@ -551,7 +542,7 @@ def excel_slave(gitMode = 'incremental'):
                                  haltOnFailure = True))
     factory.addStep(ShellCommand(command=["cmake", "--build", ".", "--target", "install", "--config", "Release"], workdir = working_folder+'/32bitDLL', haltOnFailure = True))
     # Copy the created DLL
-    factory.addStep(ShellCommand(command=' '.join(["copy", "/Y", "install_root\\shared_library\\Windows\\32bit__stdcall_calling_convention\\CoolProp.dll", "bin\\MicrosoftExcel"]), workdir = 'build', haltOnFailure = True))
+    factory.addStep(ShellCommand(command=' '.join(["copy", "/Y", "install_root\\shared_library\\Windows\\32bit__stdcall\\CoolProp.dll", "bin\\MicrosoftExcel"]), workdir = 'build', haltOnFailure = True))
 
     # ***************
     # Make 64-bit DLL
@@ -598,7 +589,7 @@ def smath_builder(gitMode = 'incremental'):
                                  haltOnFailure = True))
     factory.addStep(ShellCommand(command=["cmake", "--build", ".", "--target", "install", "--config", "Release"], workdir = working_folder+'/32bitDLL', haltOnFailure = True))
     # Copy the created DLL
-    factory.addStep(ShellCommand(command=' '.join(["copy", "/Y", "install_root\\shared_library\\Windows\\32bit__stdcall_calling_convention\\CoolProp.dll", "wrappers\\SMath\\coolprop_wrapper\\bin\\Release\\CoolProp.x86.dll"]), workdir = 'build', haltOnFailure = True))
+    factory.addStep(ShellCommand(command=' '.join(["copy", "/Y", "install_root\\shared_library\\Windows\\32bit__stdcall\\CoolProp.dll", "wrappers\\SMath\\coolprop_wrapper\\bin\\Release\\CoolProp.x86.dll"]), workdir = 'build', haltOnFailure = True))
 
     # ***************
     # Make 64-bit DLL