diff --git a/lima_common/src/common/LimaCommon.h b/lima_common/src/common/LimaCommon.h
index 58858fc64..07b23a06e 100644
--- a/lima_common/src/common/LimaCommon.h
+++ b/lima_common/src/common/LimaCommon.h
@@ -246,10 +246,10 @@ enum LimaStatusCode {
 
 BOOST_STRONG_TYPEDEF(char, NoParameters);
 
-#define UNDEFLANG std::numeric_limits<uint8_t>::max()
 
 BOOST_STRONG_TYPEDEF(uint8_t, MediaId);
 
+#define UNDEFLANG static_cast<Lima::MediaId>(std::numeric_limits<uint8_t>::max())
 /**
  * The main LIMA exception class. Throw this exception to signal a problem with
  * a precise associated message.
diff --git a/lima_linguisticprocessing/src/linguisticProcessing/core/Automaton/constraintFunctionManager.cpp b/lima_linguisticprocessing/src/linguisticProcessing/core/Automaton/constraintFunctionManager.cpp
index 48ac0256a..ba6f28885 100644
--- a/lima_linguisticprocessing/src/linguisticProcessing/core/Automaton/constraintFunctionManager.cpp
+++ b/lima_linguisticprocessing/src/linguisticProcessing/core/Automaton/constraintFunctionManager.cpp
@@ -54,8 +54,8 @@ getConstraintFunction(const std::string& id,
     it,it_end;
   boost::tie(it,it_end)=m_constraintMap.equal_range(id);
   for (;it!=it_end; it++) {
-    if ((*it).second->getComplementString() == complement && 
-  (*it).second->getLanguage() == language) {
+    if ((*it).second->getComplementString() == complement
+        && static_cast<MediaId>((*it).second->getLanguage()) == language) {
 //       LDEBUG << "getConstraintFunction: function exist: " 
 //              << (*it).first << "," << (*it).second->getComplementString() 
 //              << "->" << (*it).second;