diff --git a/Phys/LoKiPhys/LoKi/Particles25.h b/Phys/LoKiPhys/LoKi/Particles25.h
index c652676059c5ab45f10f2ebaa26919aa37bcc064..a965d45af2b372ababd79defd6ba038acba17cc8 100644
--- a/Phys/LoKiPhys/LoKi/Particles25.h
+++ b/Phys/LoKiPhys/LoKi/Particles25.h
@@ -31,7 +31,7 @@
  *  A.Golutvin, P.Koppenburg have been used in the design.
  *
  *  The file contains the functions, requested by Rob Lambert
- *  (see <a href="http://savannah.cern.ch/bugs/?47745">LoKi's Savannah portal #47745</a>)
+ *  (see <a href="https://its.cern.ch/jira/browse/LHCBPS-1352">LoKi's Savannah portal #47745 - now JIRA 1352</a>)
  *
  *  All these functors are to be used within CombineParticles framework only
  *  and surely completely useless for the regular Loki or Bender application
diff --git a/Phys/LoKiPhys/src/Particles25.cpp b/Phys/LoKiPhys/src/Particles25.cpp
index 7733b8ddbf854152d2d6172a0ca5b4ea8e927e76..2ec9ac5bf334681ae6bd4ade016e4a78111c34b3 100644
--- a/Phys/LoKiPhys/src/Particles25.cpp
+++ b/Phys/LoKiPhys/src/Particles25.cpp
@@ -35,8 +35,8 @@
  *  A.Golutvin, P.Koppenburg have been used in the design.
  *
  *  The file contains the functions, requested by Rob Lambert
- *  (see <a href="http://savannah.cern.ch/bugs/?47745">LoKi's Savannah portal #47745</a>)
- * 
+ *  (see <a href="https://its.cern.ch/jira/browse/LHCBPS-1352">LoKi's Savannah portal #47745 - now JIRA 1352</a>)
+ *
  *  All these functors are to be used within CombineParticles framework only
  *  and surely completely useless for the regular Loki or Bender application
  *
diff --git a/Phys/ParticleMaker/src/BestPIDParticleMaker.cpp b/Phys/ParticleMaker/src/BestPIDParticleMaker.cpp
index de61f0f210575b2a241c9f86be271267cd4e45d0..c9a9ce6d981f71f821c958736b479e7c0d7e653c 100644
--- a/Phys/ParticleMaker/src/BestPIDParticleMaker.cpp
+++ b/Phys/ParticleMaker/src/BestPIDParticleMaker.cpp
@@ -137,9 +137,10 @@ StatusCode BestPIDParticleMaker::makeParticles( Particle::Vector & parts ){
     if ( !track ) 
       return Error( "Charged ProtoParticle has null track reference !" );
 
-    if (track->states().empty()){
-      Warning("Track has empty states. This is likely to be bug https://savannah.cern.ch/bugs/index.php?70979");
-      continue ;
+    if ( track->states().empty() ) {
+      Warning( "Track has empty states. This is likely to be bug https://its.cern.ch/jira/browse/LHCBPS-391" )
+          .ignore();
+      continue;
     }
    
     TrackTally & tally = trackTally( track->type() );
diff --git a/Phys/ParticleMaker/src/CombinedParticleMaker.cpp b/Phys/ParticleMaker/src/CombinedParticleMaker.cpp
index b289be05dd29722d770f3c332a683f91c07df12e..14034118ff77b64a295a016ce5e35a8404624bac 100644
--- a/Phys/ParticleMaker/src/CombinedParticleMaker.cpp
+++ b/Phys/ParticleMaker/src/CombinedParticleMaker.cpp
@@ -167,10 +167,10 @@ StatusCode CombinedParticleMaker::makeParticles( LHCb::Particle::Vector & parts
     // Select tracks
     if (msgLevel(MSG::VERBOSE)) verbose() << "Trying Track " << track->key() << endmsg;
 
-    if (track->states().empty())
-    {
-      Warning("Track has empty states. This is likely to be bug https://savannah.cern.ch/bugs/index.php?70979").ignore();
-      continue ;
+    if ( track->states().empty() ) {
+      Warning( "Track has empty states. This is likely to be bug https://its.cern.ch/jira/browse/LHCBPS-391" )
+          .ignore();
+      continue;
     }
     if ( !trSel()->accept(*track) ) continue;
     if (msgLevel(MSG::VERBOSE))
diff --git a/Phys/ParticleMaker/src/NoPIDsParticleMaker.cpp b/Phys/ParticleMaker/src/NoPIDsParticleMaker.cpp
index 50da53177cb5593b64fdfdcc184b4f4a9f5e1f94..3e33dccfdcf04b427c6e9581ebc97923dc9274a0 100644
--- a/Phys/ParticleMaker/src/NoPIDsParticleMaker.cpp
+++ b/Phys/ParticleMaker/src/NoPIDsParticleMaker.cpp
@@ -100,13 +100,14 @@ StatusCode NoPIDsParticleMaker::makeParticles
     if (msgLevel(MSG::VERBOSE)) verbose() << "Trying PP " << *pp << endmsg;
    
     const LHCb::Track* ptrack = pp->track();
-    if ( 0==ptrack ) {
-      Warning("Charged protoparticle with no Track found. Ignoring.");
-      continue ;
+    if ( 0 == ptrack ) {
+      Warning( "Charged protoparticle with no Track found. Ignoring." ).ignore();
+      continue;
     }
-    if (ptrack->states().empty()){
-      Warning("Track has empty states. This is likely to be bug https://savannah.cern.ch/bugs/index.php?70979");
-      continue ;
+    if ( ptrack->states().empty() ) {
+      Warning( "Track has empty states. This is likely to be bug https://its.cern.ch/jira/browse/LHCBPS-391" )
+          .ignore();
+      continue;
     }  
 
     //    if ( 0 == pp -> charge ()   ) { continue ; }              // CONTINUE