diff --git a/CMakeLists.txt b/CMakeLists.txt
index c0793e6959870dcb01cb546dc23c74859143958b..229930f469a4320d437c28c41e64d5891db00e39 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR
   elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
       message(STATUS "Compiling with Intel settings")
    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -w")
-  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -Og -w -tcheck")
+  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -O0 -w -tcheck")
 elseif ()
 endif ()
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${warnings}")
diff --git a/math/VelocityModel.cpp b/math/VelocityModel.cpp
index 0e892420e62345309321a4b5e0268997244d2700..a25042d545163a78de4e4eca9cc31691dc16dc85 100644
--- a/math/VelocityModel.cpp
+++ b/math/VelocityModel.cpp
@@ -308,19 +308,19 @@ Point VelocityModel::e0(Pedestrian* ped, Room* room) const
       if ( (dynamic_cast<DirectionFloorfield*>(_direction.get())) ||
            (dynamic_cast<DirectionLocalFloorfield*>(_direction.get())) ||
            (dynamic_cast<DirectionSubLocalFloorfield*>(_direction.get()))  ) {
-          if (dist > 5*J_EPS_GOAL) {
+          if (dist > 50*J_EPS_GOAL) {
                desired_direction = target - pos; //ped->GetV0(target);
           } else {
                desired_direction = lastE0;
                ped->SetLastE0(lastE0); //keep old vector (revert set operation done 9 lines above)
           }
       } else if (dist > J_EPS_GOAL) {
-            desired_direction = ped->GetV0(target);
+          desired_direction = ped->GetV0(target);
       } else {
           ped->SetSmoothTurning();
           desired_direction = ped->GetV0();
       }
-     return desired_direction;
+      return desired_direction;
 }
 
 
diff --git a/routing/ff_router/ffRouter.cpp b/routing/ff_router/ffRouter.cpp
index 6ca94d4ef17fee35ec46bbef140cea79e8c78bcb..c85253cf6c6b6d7777453951bb6bc06efc8b4886 100644
--- a/routing/ff_router/ffRouter.cpp
+++ b/routing/ff_router/ffRouter.cpp
@@ -176,7 +176,7 @@ bool FFRouter::Init(Building* building)
           auto pairRoomIt = allRooms.begin();
           std::advance(pairRoomIt, i);
           UnivFFviaFM *locffptr = nullptr;
-          locffptr = new UnivFFviaFM(pairRoomIt->second.get(), building, 0.0625, 0.0, false);
+          locffptr = new UnivFFviaFM(pairRoomIt->second.get(), building, 0.125, 0.0, false);
 
           locffptr->setUser(DISTANCE_MEASUREMENTS_ONLY);
           locffptr->setMode(CENTERPOINT);