diff --git a/reco/alignment/CMakeLists.txt b/reco/alignment/CMakeLists.txt
index dcd35b5176fefa4f7f65cf5724b08e2b0214cbab..c82784439aa86164d1e6056189cca240c155b09d 100644
--- a/reco/alignment/CMakeLists.txt
+++ b/reco/alignment/CMakeLists.txt
@@ -24,7 +24,7 @@ set(PRIVATE_DEPENDENCIES
   CbmTofBase
   L1
   KF
-  bba::library
+  bba_library
   CbmStsBase
 )
 
diff --git a/reco/alignment/CbmBbaAlignmentTask.cxx b/reco/alignment/CbmBbaAlignmentTask.cxx
index 17268f7b28d6aa3ddf12ea53127b610ae79a31b1..22a7a29f31ddaa417e3ef9e6696ec5783191c4ee 100644
--- a/reco/alignment/CbmBbaAlignmentTask.cxx
+++ b/reco/alignment/CbmBbaAlignmentTask.cxx
@@ -127,7 +127,8 @@ InitStatus CbmBbaAlignmentTask::Init()
     const char* env = std::getenv("OMP_NUM_THREADS");
     if (env) {
       fNthreads = TString(env).Atoi();
-      LOG(info) << "  found environment variable OMP_NUM_THREADS = \"" << env << "\", read as integer: " << fNthreads;
+      LOG(info) << "BBA:   found environment variable OMP_NUM_THREADS = \"" << env
+                << "\", read as integer: " << fNthreads;
     }
   }
 
diff --git a/reco/kfnew/CbmKfTrackFitter.cxx b/reco/kfnew/CbmKfTrackFitter.cxx
index 14a67f0dfba7962319c4194edfeea6e1d80f8317..4905e7b2d468f20395df018b043439d470f8544f 100644
--- a/reco/kfnew/CbmKfTrackFitter.cxx
+++ b/reco/kfnew/CbmKfTrackFitter.cxx
@@ -714,6 +714,10 @@ bool CbmKfTrackFitter::FitTrajectory(CbmKfTrackFitter::Trajectory& t)
       printNode("fit upstream", iNode);
     }
 
+    if (!ok) {
+      return false;
+    }
+
     if (ok) {
       int iNode = firstHitNode;
 
@@ -780,7 +784,7 @@ bool CbmKfTrackFitter::FitTrajectory(CbmKfTrackFitter::Trajectory& t)
       LOG(error) << "CbmKfTrackFitter: " << fDebugInfo << ": chi2 mismatch: dn " << dnChi2 << " != up " << upChi2
                  << " first node " << firstHitNode << " last node " << lastHitNode << " of " << nNodes;
       //if (fVerbosityLevel > 0) {
-      exit(1);
+      //exit(1);
       //}
     }
   }