diff --git a/NPAnalysis/newTAMU/Analysis.cxx b/NPAnalysis/newTAMU/Analysis.cxx
index 276bafb7c31a7f1bdc8cdaa3fc186f47f2d749da..4a856cb0284c91724eb75bdf470fd41e773dbcd0 100644
--- a/NPAnalysis/newTAMU/Analysis.cxx
+++ b/NPAnalysis/newTAMU/Analysis.cxx
@@ -36,8 +36,8 @@ Analysis::~Analysis(){
 
 ////////////////////////////////////////////////////////////////////////////////
 void Analysis::Init(){
-	TH  = (TTiaraHyballPhysics*) m_DetectorManager -> GetDetector("TiaraHyball");
-  TB  = (TTiaraBarrelPhysics*) m_DetectorManager -> GetDetector("TiaraBarrel");
+	TH  = (TTiaraHyballPhysics*) m_DetectorManager -> GetDetector("TiaraHyballWedge");
+  TB  = (TTiaraBarrelPhysics*) m_DetectorManager -> GetDetector("TiaraInnerBarrel=");
   proton_CD2 = EnergyLoss("proton_CD2.G4table","G4Table",100 );
   proton_Al = EnergyLoss("proton_Al.G4table","G4Table",10);
   proton_Si = EnergyLoss("proton_Si.G4table","G4Table",10);
diff --git a/NPLib/Core/NPDetectorManager.cxx b/NPLib/Core/NPDetectorManager.cxx
index 14235520e635159b759bb658758d5bf6710b2c83..a56e2ca53c40ce7bcb5cf668e531f3f2fb71bc34 100644
--- a/NPLib/Core/NPDetectorManager.cxx
+++ b/NPLib/Core/NPDetectorManager.cxx
@@ -307,6 +307,8 @@ this_thread::sleep_for(chrono::milliseconds(100));
       }
       m_Ready[id]=false;
     }
+		else
+			this_thread::yield();
   }
 }
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/NPLib/Tiara/TTiaraBarrelPhysics.cxx b/NPLib/Tiara/TTiaraBarrelPhysics.cxx
index 1f544792110d2e4cbb1b5cc26856514977d1c5da..2c06f20a931eb891cdd1ca7e101323f6b21dd462 100644
--- a/NPLib/Tiara/TTiaraBarrelPhysics.cxx
+++ b/NPLib/Tiara/TTiaraBarrelPhysics.cxx
@@ -704,8 +704,8 @@ void TTiaraBarrelPhysics::BuildPhysicalEvent(){
       class brlproxy{
         public:
           brlproxy(){
-            NPA::DetectorFactory::getInstance()->AddToken("TiaraInnerBarrel","Tiara");
-            NPA::DetectorFactory::getInstance()->AddDetector("TiaraInnerBarrel",TTiaraBarrelPhysics::Construct);
+            NPA::DetectorFactory::getInstance()->AddToken("TiaraInnerBarrel=","Tiara");
+            NPA::DetectorFactory::getInstance()->AddDetector("TiaraInnerBarrel=",TTiaraBarrelPhysics::Construct);
           }
       };
 
diff --git a/NPLib/Tiara/TTiaraHyballPhysics.cxx b/NPLib/Tiara/TTiaraHyballPhysics.cxx
index c8d1de8aaa33b077df001bfb0f30e59feef5ad3f..55a620cc36fbab676bf5015d352329b2c75819e7 100644
--- a/NPLib/Tiara/TTiaraHyballPhysics.cxx
+++ b/NPLib/Tiara/TTiaraHyballPhysics.cxx
@@ -786,8 +786,8 @@ extern "C"{
 class proxy{
   public:
     proxy(){
-      NPA::DetectorFactory::getInstance()->AddToken("TiaraHyball","Tiara");
-      NPA::DetectorFactory::getInstance()->AddDetector("TiaraHyball",TTiaraHyballPhysics::Construct);
+      NPA::DetectorFactory::getInstance()->AddToken("TiaraHyballWedge","Tiara");
+      NPA::DetectorFactory::getInstance()->AddDetector("TiaraHyballWedge",TTiaraHyballPhysics::Construct);
     }
 };
 
diff --git a/NPLib/Utility/npanalysis.cxx b/NPLib/Utility/npanalysis.cxx
index 21827565c7c5c344376e1aaf604c22ccc0508fc7..bdd27c1900348529c2b1bc8c48642a147b948df4 100644
--- a/NPLib/Utility/npanalysis.cxx
+++ b/NPLib/Utility/npanalysis.cxx
@@ -61,7 +61,7 @@ int main(int argc , char** argv){
 
   // Attempt to load an analysis
   NPA::VAnalysis* UserAnalysis = NULL;
-  string libName = "libNPAnalysis" + SHARED_LIB_EXTENSION;
+  string libName = "./libNPAnalysis" + SHARED_LIB_EXTENSION;
   dlopen(libName.c_str(),RTLD_NOW);
   char* error = dlerror();
   if(error==NULL){