diff --git a/CMakeLists.txt b/CMakeLists.txt
index c2095c18e..311fb0515 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -121,6 +121,8 @@ elseif(MSVC)
 	add_definitions(/bigobj)
 	# required by GTest and PrismGrammar::createIntegerVariable
 	add_definitions(/D_VARIADIC_MAX=10)
+	# Windows.h breaks GMM in gmm_except.h because of its macro definition for min and max
+	add_definitions(/DNOMINMAX)
 	
 	# MSVC does not do strict-aliasing, so no option needed
 else(CLANG)
diff --git a/src/storage/SparseMatrix.h b/src/storage/SparseMatrix.h
index d53a5ab97..25935c1fd 100644
--- a/src/storage/SparseMatrix.h
+++ b/src/storage/SparseMatrix.h
@@ -1,23 +1,24 @@
 #ifndef STORM_STORAGE_SPARSEMATRIX_H_
 #define STORM_STORAGE_SPARSEMATRIX_H_
 
-#include <exception>
-#include <new>
-#include <algorithm>
-#include <iostream>
-#include <iterator>
-#include <set>
-#include <cstdint>
-
 // To detect whether the usage of TBB is possible, this include is neccessary
 #include "storm-config.h"
 
 #ifdef STORM_HAVE_INTELTBB
-#	include <new> // This fixes a potential dependency ordering problem between GMM and TBB
+#	include "utility/OsDetection.h" // This fixes a potential dependency ordering problem between GMM and TBB
+#	include <new>
 #	include "tbb/tbb.h"
 #	include <iterator>
 #endif
 
+#include <exception>
+#include <new>
+#include <algorithm>
+#include <iostream>
+#include <iterator>
+#include <set>
+#include <cstdint>
+
 #include "src/exceptions/InvalidStateException.h"
 #include "src/exceptions/InvalidArgumentException.h"
 #include "src/exceptions/OutOfRangeException.h"
@@ -1545,7 +1546,7 @@ private:
 		tbbHelper_MatrixRowVectorScalarProduct(M const* matrixA, V const* vectorX, V * resultVector) : matrixA(matrixA), vectorX(vectorX), resultVector(resultVector) {}
 
 		void operator() (const tbb::blocked_range<uint_fast64_t>& r) const {
-			for (uint_fast64_t row = r.begin(); row <= r.end(); ++row) {
+			for (uint_fast64_t row = r.begin(); row < r.end(); ++row) {
 				uint_fast64_t index = matrixA->rowIndications.at(row);
 				uint_fast64_t indexEnd = matrixA->rowIndications.at(row + 1);
 				
diff --git a/src/utility/OsDetection.h b/src/utility/OsDetection.h
index 8fb6c7c6e..1969a6de7 100644
--- a/src/utility/OsDetection.h
+++ b/src/utility/OsDetection.h
@@ -19,7 +19,11 @@
 #	include <sys/resource.h> // Required by storm.cpp, Memory Usage
 #elif defined _WIN32 || defined _WIN64
 #	define WINDOWS
-#	define NOMINMAX
+#	ifndef NOMINMAX
+#		define NOMINMAX
+#		undef min
+#		undef max
+#	endif
 #	include <Windows.h>
 #	include <winnt.h>
 #	include <DbgHelp.h>