diff --git a/include/core/common/factory.h b/include/core/common/factory.h
index 4a760ddc025c4ee68c48d7da03c50efae4a58ccd..eda43efdcb646630164ebda2fb48002b5b3b0f62 100644
--- a/include/core/common/factory.h
+++ b/include/core/common/factory.h
@@ -267,9 +267,9 @@ inline bool Factory<TypeBase, TypeInput...>::registerCreator(const std::string&
 {
     bool reg = callbacks_.insert(typename CallbackMap::value_type(_type, createFn)).second;
     if (reg)
-        std::cout << std::setw(22) << std::left << getClass() << " <--  registered  " << _type << std::endl;
+        std::cout << std::setw(26) << std::left << getClass() << " <--  registered  " << _type << std::endl;
     else
-        std::cout << std::setw(22) << std::left << getClass() << " X--  skipping  " << _type << ": already registered." << std::endl;
+        std::cout << std::setw(26) << std::left << getClass() << " X--   skipping   " << _type << ": already registered." << std::endl;
 
     return reg;
 }
diff --git a/include/core/solver/solver_factory.h b/include/core/solver/solver_factory.h
index 5205ad5c9e1ff18d545dcd43555ecb47b4d780f8..95bab65a735c36946f610ad535fbab43c0516f19 100644
--- a/include/core/solver/solver_factory.h
+++ b/include/core/solver/solver_factory.h
@@ -219,9 +219,9 @@ inline std::string SolverFactory::getClass()
   return "SolverFactory";
 }
 
-#define WOLF_REGISTER_SOLVER(SolverName) \
+#define WOLF_REGISTER_SOLVER(SolverType, SolverName) \
   namespace{ const bool WOLF_UNUSED SolverName##Registered = \
-     wolf::SolverFactory::get().registerCreator("Solver", SolverName::create); } \
+     wolf::SolverFactory::get().registerCreator(SolverType, SolverName::create); } \
 
 } /* namespace wolf */
 
diff --git a/src/ceres_wrapper/ceres_manager.cpp b/src/ceres_wrapper/ceres_manager.cpp
index b64e86ab9008296a57e01c7ed8a3a8061fa88b2b..7d56eefa61707d3aa78d251c893bf37fef689c46 100644
--- a/src/ceres_wrapper/ceres_manager.cpp
+++ b/src/ceres_wrapper/ceres_manager.cpp
@@ -444,6 +444,6 @@ void CeresManager::check()
 } // namespace wolf
 #include "core/solver/solver_factory.h"
 namespace wolf {
-    WOLF_REGISTER_SOLVER(CeresManager)
+    WOLF_REGISTER_SOLVER("CERES", CeresManager)
 } // namespace wolf
 
diff --git a/src/processor/processor_base.cpp b/src/processor/processor_base.cpp
index d3d025b7b43090a87f4abb2de6e4e86ffccfd6f6..1e8b098df1dd882ff16756c3f3345080637a43e0 100644
--- a/src/processor/processor_base.cpp
+++ b/src/processor/processor_base.cpp
@@ -33,8 +33,8 @@ bool ProcessorBase::permittedAuxFrame()
 
 void ProcessorBase::keyFrameCallback(FrameBasePtr _keyframe_ptr, const Scalar& _time_tol_other)
 {
-    WOLF_DEBUG("P", isMotion() ? "M " : "T ", getName(), ": KF", _keyframe_ptr->id(), " callback received with ts = ", _keyframe_ptr->getTimeStamp());
     assert(_keyframe_ptr != nullptr && "keyFrameCallback with a nullptr frame");
+    WOLF_DEBUG("P", isMotion() ? "M " : "T ", getName(), ": KF", _keyframe_ptr->id(), " callback received with ts = ", _keyframe_ptr->getTimeStamp());
 
     // buffering anyway
     buffer_pack_kf_.add(_keyframe_ptr, _time_tol_other);
@@ -47,8 +47,8 @@ void ProcessorBase::keyFrameCallback(FrameBasePtr _keyframe_ptr, const Scalar& _
 
 void ProcessorBase::captureCallback(CaptureBasePtr _capture_ptr)
 {
-    WOLF_DEBUG("P", isMotion() ? "M " : "T ", getName(), ": Capture ", _capture_ptr->id(), " callback received with ts = ", _capture_ptr->getTimeStamp());
     assert(_capture_ptr != nullptr && "captureCallback with a nullptr capture");
+    WOLF_DEBUG("P", isMotion() ? "M " : "T ", getName(), ": Capture ", _capture_ptr->id(), " callback received with ts = ", _capture_ptr->getTimeStamp());
 
     // if trigger, process directly without buffering
     if (triggerInCapture(_capture_ptr))