diff --git a/common/pgm_base.cpp b/common/pgm_base.cpp
index e1d1046caf..6263434e94 100644
--- a/common/pgm_base.cpp
+++ b/common/pgm_base.cpp
@@ -137,7 +137,7 @@ PGM_BASE::~PGM_BASE()
 {
     Destroy();
 
-    for( size_t n = 0; n < m_argcUtf8; n++ )
+    for( int n = 0; n < m_argcUtf8; n++ )
     {
         delete m_argvUtf8[n];
     }
@@ -385,7 +385,7 @@ void PGM_BASE::BuildArgvUtf8()
     m_argcUtf8 = argArray.size();
 
     m_argvUtf8 = new char*[m_argcUtf8 + 1];
-    for( size_t n = 0; n < m_argcUtf8; n++ )
+    for( int n = 0; n < m_argcUtf8; n++ )
     {
         m_argvUtf8[n] = wxStrdup( argArray[n].ToUTF8() );
     }
diff --git a/pcbnew/ibis/ibis_parser.cpp b/pcbnew/ibis/ibis_parser.cpp
index 3201069836..2bca839a6b 100644
--- a/pcbnew/ibis/ibis_parser.cpp
+++ b/pcbnew/ibis/ibis_parser.cpp
@@ -1150,14 +1150,6 @@ bool IbisParser::changeContext( std::string& aKeyword )
 {
     bool status = true;
 
-    // Old context;
-    IBIS_PARSER_CONTEXT old_context = m_context;
-    IbisComponent*      old_component = m_currentComponent;
-    IbisModel*          old_model = m_currentModel;
-    IbisModelSelector*  old_modelSelector = m_currentModelSelector;
-    IbisPackageModel*   old_packageModel = m_currentPackageModel;
-
-
     if( status )
     {
         switch( m_context )