diff --git a/Code/Core/otbWrapperParameter.h b/Code/Core/otbWrapperParameter.h
index 4e73cf157c47bd9a9273e475e734160116ce760a..d36218796f8ccd6fa6a80a35496d47c37fcaa6f1 100644
--- a/Code/Core/otbWrapperParameter.h
+++ b/Code/Core/otbWrapperParameter.h
@@ -35,18 +35,18 @@ enum DefaultValueMode
      * This parameter has no default behaviour and should be set by
      * the user. 
      */
-    UNKNOWN,
+    DefaultValueMode_UNKNOWN,
     /**
      * The default value of this parameter can be estimated from
      * other parameters.
      */
-    RELATIVE,
+    DefaultValueMode_RELATIVE,
 
     /** 
      * The default value of this parameter is not depending on any
      * other parameter.
      */
-    ABSOLUTE
+    DefaultValueMode_ABSOLUTE
   };
 
 
@@ -167,7 +167,7 @@ protected:
                 m_Description(""),
                 m_Key(""),
                 m_Mandatory(true),
-                m_DefaultValueMode(UNKNOWN)
+                m_DefaultValueMode(DefaultValueMode_UNKNOWN)
   {}
 
   /** Destructor */
diff --git a/Code/Core/otbWrapperParameterGroup.cxx b/Code/Core/otbWrapperParameterGroup.cxx
index fc92a5e3272291c8dfa1ef9b77a356d30d75819d..7568b05c98fe778e22e78b7b3615247ec2b72a8e 100644
--- a/Code/Core/otbWrapperParameterGroup.cxx
+++ b/Code/Core/otbWrapperParameterGroup.cxx
@@ -371,7 +371,7 @@ ParameterGroup::GetParameterByKey(std::string name)
 unsigned int
 ParameterGroup::GetNumberOfParameters()
 {
-  m_ParameterList.size();
+  return m_ParameterList.size();
 }
 
 }
diff --git a/Code/Wrappers/SWIG/otbApplication.i b/Code/Wrappers/SWIG/otbApplication.i
index 4f61f03b12a907b035154957b85774298b0463f6..2ed6b05fecc60335b07f6528e76c2ca84fb61fc1 100644
--- a/Code/Wrappers/SWIG/otbApplication.i
+++ b/Code/Wrappers/SWIG/otbApplication.i
@@ -17,9 +17,9 @@ namespace Wrapper
 
   enum DefaultValueMode
   {
-    UNKNOWN,
-    RELATIVE,
-    ABSOLUTE
+    DefaultValueMode_UNKNOWN,
+    DefaultValueMode_RELATIVE,
+    DefaultValueMode_ABSOLUTE
   };
   
   typedef enum