diff --git a/pcbnew/class_board.cpp b/pcbnew/class_board.cpp
index 2a1ae2e66a..61e5a9f9ef 100644
--- a/pcbnew/class_board.cpp
+++ b/pcbnew/class_board.cpp
@@ -2241,7 +2241,7 @@ void BOARD::SetViaSizeIndex( unsigned aIndex )
 
 void BOARD::SetTrackWidthIndex( unsigned aIndex )
 {
-    if( m_trackWidthIndex >= m_TrackWidthList.size() )
+    if( aIndex >= m_TrackWidthList.size() )
         m_trackWidthIndex = m_TrackWidthList.size();
     else
         m_trackWidthIndex = aIndex;
diff --git a/scripting/python_scripting.cpp b/scripting/python_scripting.cpp
index 2cf9c9dbae..24f0fa0065 100644
--- a/scripting/python_scripting.cpp
+++ b/scripting/python_scripting.cpp
@@ -341,7 +341,7 @@ wxString PyErrStringWithTraceback()
 
     wxArrayString res = PyArrayStringToWx( result );
 
-    for( int i = 0; i<res.Count(); i++ )
+    for( unsigned i = 0; i<res.Count(); i++ )
     {
         err += res[i] + wxT( "\n" );
     }
diff --git a/scripting/python_scripting.h b/scripting/python_scripting.h
index a00d1cab2f..170f6cce98 100644
--- a/scripting/python_scripting.h
+++ b/scripting/python_scripting.h
@@ -17,6 +17,9 @@
 #endif
 #endif
 
+#include <wx/string.h>
+#include <wx/arrstr.h>
+
 /* Function pcbnewInitPythonScripting
  * Initializes the Python engine inside pcbnew
  */