diff --git a/Source/Ember/Renderer.cpp b/Source/Ember/Renderer.cpp
index d3ad4e6..34b3cbc 100644
--- a/Source/Ember/Renderer.cpp
+++ b/Source/Ember/Renderer.cpp
@@ -890,7 +890,7 @@ eRenderStatus Renderer<T, bucketT>::LogScaleDensityFilter(bool forceOutput)
 				}
 			}
 		}
-	});
+	}, static_partitioner());
 	//t.Toc(__FUNCTION__);
 	return m_Abort ? eRenderStatus::RENDER_ABORT : eRenderStatus::RENDER_OK;
 }
@@ -1050,7 +1050,7 @@ eRenderStatus Renderer<T, bucketT>::GaussianDensityFilter()
 				}
 			}
 		}
-	});
+	}, static_partitioner());
 
 	if (m_Callback && !m_Abort)
 		m_Callback->ProgressFunc(m_Ember, m_ProgressParameter, 100.0, 1, 0);
@@ -1109,7 +1109,7 @@ eRenderStatus Renderer<T, bucketT>::AccumulatorToFinalImage(v4F* pixels, size_t
 				GammaCorrection(*rowStart, background, g, linRange, vibrancy, false, glm::value_ptr(*rowStart));//Write back in place.
 				rowStart++;
 			}
-		});
+		}, static_partitioner());
 	}
 
 	if (m_Abort)
@@ -1155,7 +1155,7 @@ eRenderStatus Renderer<T, bucketT>::AccumulatorToFinalImage(v4F* pixels, size_t
 			auto pf = reinterpret_cast<float*>(pv4T);
 			GammaCorrection(*(reinterpret_cast<tvec4<bucketT, glm::defaultp>*>(&newBucket)), background, g, linRange, vibrancy, true, pf);
 		}
-	});
+	}, static_partitioner());
 
 	//Insert the palette into the image for debugging purposes. Not implemented on the GPU.
 	if (m_InsertPalette)
@@ -1293,7 +1293,7 @@ EmberStats Renderer<T, bucketT>::Iterate(size_t iterCount, size_t temporalSample
 				}
 			}
 		}
-	});
+	}, static_partitioner());
 	stats.m_Iters = std::accumulate(m_SubBatch.begin(), m_SubBatch.end(), 0ULL);//Sum of iter count of all threads.
 	stats.m_Badvals = std::accumulate(m_BadVals.begin(), m_BadVals.end(), 0ULL);
 	stats.m_IterMs = m_IterTimer.Toc();
diff --git a/Source/EmberCommon/EmberCommonPch.h b/Source/EmberCommon/EmberCommonPch.h
index f64f851..1c4872e 100644
--- a/Source/EmberCommon/EmberCommonPch.h
+++ b/Source/EmberCommon/EmberCommonPch.h
@@ -59,12 +59,18 @@
 
 //Exr
 #ifdef _WIN32
-#define OPENEXR_DLL 1
+	#define OPENEXR_DLL 1
 #endif
 
-#include <ImfRgbaFile.h>
-#include <ImfStringAttribute.h>
-#include <half.h>
+#ifdef __APPLE__
+	#include <OpenEXR/ImfRgbaFile.h>
+	#include <OpenEXR/ImfStringAttribute.h>
+	#include <OpenEXR/half.h>
+#else
+	#include <ImfRgbaFile.h>
+	#include <ImfStringAttribute.h>
+	#include <half.h>
+#endif
 
 using namespace Imf;
 using namespace Imath;
diff --git a/Source/EmberTester/EmberTester.cpp b/Source/EmberTester/EmberTester.cpp
index 87389cc..7f67733 100644
--- a/Source/EmberTester/EmberTester.cpp
+++ b/Source/EmberTester/EmberTester.cpp
@@ -5,7 +5,15 @@
 #include <list>
 #include <deque>
 
-#include <ImfRgbaFile.h>
+#ifdef __APPLE__
+	#include <OpenEXR/ImfRgbaFile.h>
+	#include <OpenEXR/ImfStringAttribute.h>
+	#include <OpenEXR/half.h>
+#else
+	#include <ImfRgbaFile.h>
+	#include <ImfStringAttribute.h>
+	#include <half.h>
+#endif
 //#include <ImfStringAttribute.h>
 //#include <ImfMatrixAttribute.h>
 //#include <ImfArray.h>