diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0d35c5511..7fe522046 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -81,17 +81,7 @@ set(CMAKE_INSTALL_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH  "Installation directo
 message("CMAKE_INSTALL_DIR: ${CMAKE_INSTALL_DIR}")
 
 # If the STORM_DEVELOPER option was turned on, by default we target a debug version, otherwise a release version.
-if (STORM_DEVELOPER)
-    if (NOT CMAKE_BUILD_TYPE)
-        set(CMAKE_BUILD_TYPE "DEBUG")
-    endif()
-    add_definitions(-DSTORM_DEV)
-else()
-    set(STORM_LOG_DISABLE_DEBUG ON)
-    if (NOT CMAKE_BUILD_TYPE)
-        set(CMAKE_BUILD_TYPE "RELEASE")
-    endif()
-endif()
+set(CMAKE_BUILD_TYPE "DEBUG")
 
 message(STATUS "Storm - Building ${CMAKE_BUILD_TYPE} version.")
 
diff --git a/src/storm-dft/transformations/DftToGspnTransformator.cpp b/src/storm-dft/transformations/DftToGspnTransformator.cpp
index caa40191e..2d07054e9 100644
--- a/src/storm-dft/transformations/DftToGspnTransformator.cpp
+++ b/src/storm-dft/transformations/DftToGspnTransformator.cpp
@@ -987,13 +987,14 @@ namespace storm {
 
                     uint64_t tWinFlip = builder.addImmediateTransition(getFailPriority(dftDependency) + 1,
                                                                        dftDependency->probability(),
-                                                                       "_win_flip");
+                                                                       dftDependency->name() + "_win_flip");
                     builder.addInputArc(flipPlace, tWinFlip);
                     builder.addOutputArc(tWinFlip, forwardPlace);
 
                     uint64_t tLooseFlip = builder.addImmediateTransition(getFailPriority(dftDependency) + 1,
                                                                          storm::utility::one<ValueType>() -
-                                                                         dftDependency->probability(), "_loose_flip");
+                                                                         dftDependency->probability(),
+                                                                         dftDependency->name() + "_lose_flip");
                     builder.addInputArc(flipPlace, tLooseFlip);
                 } else {
                     // FDEP
@@ -1062,6 +1063,9 @@ namespace storm {
                     }
 
                 }
+                if (failedPlace == 0) {
+                    failedPlaces.push_back(failedPlace);
+                }
             }
 
             template<typename ValueType>