diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/Root/TrigDecisionToolCore.cxx b/Trigger/TrigAnalysis/TrigDecisionTool/Root/TrigDecisionToolCore.cxx
index 5a4c33d98b24c14a15514b6718cc295aa3ebd4d5..96c9ad99fcb569f63797f4172f107dda8e91255d 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/Root/TrigDecisionToolCore.cxx
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/Root/TrigDecisionToolCore.cxx
@@ -38,7 +38,8 @@ const Trig::CacheGlobalMemory* Trig::TrigDecisionToolCore::cgm() const {
   const Trig::CacheGlobalMemory* ptr = m_cacheGlobalMemory.get();
   // A consequence of placing the cache in a slot-specific wrapper
   Trig::CacheGlobalMemory* p ATLAS_THREAD_SAFE = const_cast<Trig::CacheGlobalMemory*>(ptr);
-  p->navigation (m_navigation);
+  HLT::TrigNavStructure* navigation ATLAS_THREAD_SAFE = m_navigation;
+  p->navigation (navigation);
   return ptr;
 }
 
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/FeatureCollectAthena.h b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/FeatureCollectAthena.h
index 0feb6f767325b74dacf959ab1bb0dfef97655adc..7a5bafb0f1fcece5a7473792f53763f6bf64502c 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/FeatureCollectAthena.h
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/FeatureCollectAthena.h
@@ -218,7 +218,7 @@ namespace Trig {
     
     
       template<class FEATURE>
-      void do_it() const {
+      void do_it() {
 	//std::cout << "TrigDecisionTool::Feature::get_links: getting links from navi for element in feature list: " << ClassID_traits<FEATURE>::typeName() << std::endl;
 	//std::cout << "TrigDecisionTool::Feature::get_links:                      type originally  requested is: " << ClassID_traits<REQUESTED>::typeName() << std::endl;
 
@@ -233,10 +233,10 @@ namespace Trig {
       }
 
       template<class FEATURE,bool do_flatten>
-      void _do_it(false_type dummy = false_type()) const {(void)dummy;/* do nothing */;}
+      void _do_it(false_type dummy = false_type()) {(void)dummy;/* do nothing */;}
     
       template<class FEATURE,bool do_flatten>
-      void _do_it(true_type /*dummy*/ = true_type()) const {
+      void _do_it(true_type /*dummy*/ = true_type()) {
 
 	//const HLT::TriggerElement* sourceTE(0);
 	std::string sourceLabel;