diff --git a/src/constraint_GPS_pseudorange_2D.h b/src/constraint_GPS_pseudorange_2D.h
index 6bda014c58944abeff03bf04621f6723f234b1e6..7a04463b9c277bb3fb265fad1d0bd37cccfa06fc 100644
--- a/src/constraint_GPS_pseudorange_2D.h
+++ b/src/constraint_GPS_pseudorange_2D.h
@@ -4,8 +4,8 @@
 #define LIGHT_SPEED_ 299792458
 
 //Wolf includes
-#include <sensor_GPS.h>
-#include "feature_gps_pseudorange.h"
+#include "sensor_GPS.h"
+#include "feature_GPS_pseudorange.h"
 #include "constraint_autodiff.h"
 
 //std
diff --git a/src/processor_GPS.cpp b/src/processor_GPS.cpp
index a72f47119b5b67d48058e8da557ce8be824b461b..21940ef5ef058c3cfb06bfd0c688386e4dac7e37 100644
--- a/src/processor_GPS.cpp
+++ b/src/processor_GPS.cpp
@@ -6,7 +6,7 @@
 #include <feature_GPS_pseudorange.h>
 #include <processor_GPS.h>
 
-#include "capture_gps.h"
+#include "capture_GPS.h"
 
 namespace wolf
 {
diff --git a/src/processor_GPS.h b/src/processor_GPS.h
index 0941b22e5227a797f18f7393b6ab4ba18788e131..bd14aa018fcdaa544507cde0f3bbcd7e6556b3ff 100644
--- a/src/processor_GPS.h
+++ b/src/processor_GPS.h
@@ -7,7 +7,7 @@
 
 // Wolf includes
 #include "processor_base.h"
-#include "capture_gps.h"
+#include "capture_GPS.h"
 
 // Std includes
 
diff --git a/src/solver/solver_manager.cpp b/src/solver/solver_manager.cpp
index 26fb4fd7fe7a3df9f51f489b5fb5cce6b265339d..f31180caf423c6ac72013622913d8e955d1b7983 100644
--- a/src/solver/solver_manager.cpp
+++ b/src/solver/solver_manager.cpp
@@ -55,9 +55,7 @@ void SolverManager::update()
       }
       case StateBlock::Notification::STATE_UPDATE:
       {
-        const bool registered = state_blocks_.find(state)!=state_blocks_.end();
-
-        WOLF_DEBUG_COND(!registered,
+        WOLF_DEBUG_COND(state_blocks_.find(state)==state_blocks_.end(),
                         "Updating the state of an unregistered StateBlock !");
 
         // This will throw if StateBlock wasn't registered