diff --git a/Phys/DecayTreeTupleTracking/src/TupleToolMCAssociatedClusters.cpp b/Phys/DecayTreeTupleTracking/src/TupleToolMCAssociatedClusters.cpp
index 730095f85eb5212e9ea3c90e1c8c0684943378a5..3f34db50e9d2d9cb5e9962f081bc7d55c4652368 100644
--- a/Phys/DecayTreeTupleTracking/src/TupleToolMCAssociatedClusters.cpp
+++ b/Phys/DecayTreeTupleTracking/src/TupleToolMCAssociatedClusters.cpp
@@ -154,10 +154,10 @@ StatusCode TupleToolMCAssociatedClusters::fill( const LHCb::Particle*, const LHC
     /**
      * Comparing here the number of LHCb IDs v.s. the number of MCParticle clusters.
      */
-    std::vector<int> usedVeloIDs;
-    std::vector<int> usedOTIDs;
-    std::vector<int> usedITIDs;
-    std::vector<int> usedTTIDs;
+    std::vector<unsigned int> usedVeloIDs;
+    std::vector<unsigned int> usedOTIDs;
+    std::vector<unsigned int> usedITIDs;
+    std::vector<unsigned int> usedTTIDs;
 
     for ( const auto& lhcbID : lhcbIDs ) {
       if ( lhcbID.isOT() ) {
@@ -169,7 +169,7 @@ StatusCode TupleToolMCAssociatedClusters::fill( const LHCb::Particle*, const LHC
 
         if ( it != otChannelIdList.end() ) {
           if ( m_checkUniqueness &&
-               std::find( usedOTIDs.begin(), usedOTIDs.end(), measuredOTChannelID ) == usedOTIDs.end() ) {
+               std::find( usedOTIDs.begin(), usedOTIDs.end(), measuredOTChannelID.channelID() ) == usedOTIDs.end() ) {
             usedOTIDs.push_back( measuredOTChannelID );
             nFoundUniqueOT++;
           }
@@ -187,7 +187,7 @@ StatusCode TupleToolMCAssociatedClusters::fill( const LHCb::Particle*, const LHC
 
         if ( it != itClusterList.end() ) {
           if ( m_checkUniqueness &&
-               std::find( usedITIDs.begin(), usedITIDs.end(), measuredITChannelID ) == usedITIDs.end() ) {
+               std::find( usedITIDs.begin(), usedITIDs.end(), measuredITChannelID.channelID() ) == usedITIDs.end() ) {
             usedITIDs.push_back( measuredITChannelID );
             nFoundUniqueIT++;
           }
@@ -205,7 +205,7 @@ StatusCode TupleToolMCAssociatedClusters::fill( const LHCb::Particle*, const LHC
 
         if ( it != itClusterList.end() ) {
           if ( m_checkUniqueness &&
-               std::find( usedTTIDs.begin(), usedTTIDs.end(), measuredTTChannelID ) == usedTTIDs.end() ) {
+               std::find( usedTTIDs.begin(), usedTTIDs.end(), measuredTTChannelID.channelID() ) == usedTTIDs.end() ) {
             usedTTIDs.push_back( measuredTTChannelID );
             nFoundUniqueTT++;
           }
@@ -222,8 +222,8 @@ StatusCode TupleToolMCAssociatedClusters::fill( const LHCb::Particle*, const LHC
                                        } );
 
         if ( it != veloClusterList.end() ) {
-          if ( m_checkUniqueness &&
-               std::find( usedVeloIDs.begin(), usedVeloIDs.end(), measuredVeloChannelID ) == usedVeloIDs.end() ) {
+          if ( m_checkUniqueness && std::find( usedVeloIDs.begin(), usedVeloIDs.end(),
+                                               measuredVeloChannelID.channelID() ) == usedVeloIDs.end() ) {
             usedVeloIDs.push_back( measuredVeloChannelID );
             nFoundUniqueVelo++;
           }
diff --git a/cmake/AnalysisDependencies.cmake b/cmake/AnalysisDependencies.cmake
index 9dbc94ce687c2dfa06177892e008339c96261217..c5de9ad5b8fcf962f522ef412084adfab977c40d 100644
--- a/cmake/AnalysisDependencies.cmake
+++ b/cmake/AnalysisDependencies.cmake
@@ -25,7 +25,7 @@ endif()
 lhcb_find_package(Phys REQUIRED)
 
 find_package(Python REQUIRED
-    Development
+    Interpreter Development
 )
 find_package(ROOT REQUIRED
     Core