diff --git a/common/widgets/color4Dpickerdlg_base.cpp b/common/widgets/color4Dpickerdlg_base.cpp
index e806898b64..58bcecf125 100644
--- a/common/widgets/color4Dpickerdlg_base.cpp
+++ b/common/widgets/color4Dpickerdlg_base.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jul  2 2017)
+// C++ code generated with wxFormBuilder (version Aug  4 2017)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!
@@ -31,7 +31,7 @@ COLOR4D_PICKER_DLG_BASE::COLOR4D_PICKER_DLG_BASE( wxWindow* parent, wxWindowID i
 	sbSizerViewRGB = new wxStaticBoxSizer( new wxStaticBox( m_panelFreeColors, wxID_ANY, wxT("RGB") ), wxVERTICAL );
 	
 	
-	sbSizerViewRGB->Add( 0, 0, 1, wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 );
+	sbSizerViewRGB->Add( 0, 0, 1, wxALIGN_CENTER_HORIZONTAL, 5 );
 	
 	m_RgbBitmap = new wxStaticBitmap( sbSizerViewRGB->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 264,264 ), 0 );
 	m_RgbBitmap->SetMinSize( wxSize( 264,264 ) );
@@ -39,7 +39,7 @@ COLOR4D_PICKER_DLG_BASE::COLOR4D_PICKER_DLG_BASE( wxWindow* parent, wxWindowID i
 	sbSizerViewRGB->Add( m_RgbBitmap, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
 	
 	
-	sbSizerViewRGB->Add( 0, 0, 1, wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 );
+	sbSizerViewRGB->Add( 0, 0, 1, wxALIGN_CENTER_HORIZONTAL, 5 );
 	
 	
 	bSizerPanels->Add( sbSizerViewRGB, 1, wxEXPAND|wxBOTTOM|wxRIGHT, 5 );
@@ -48,7 +48,7 @@ COLOR4D_PICKER_DLG_BASE::COLOR4D_PICKER_DLG_BASE( wxWindow* parent, wxWindowID i
 	sbSizerViewHSV = new wxStaticBoxSizer( new wxStaticBox( m_panelFreeColors, wxID_ANY, wxT("Hue and Saturation") ), wxVERTICAL );
 	
 	
-	sbSizerViewHSV->Add( 0, 0, 1, wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 );
+	sbSizerViewHSV->Add( 0, 0, 1, wxALIGN_CENTER_HORIZONTAL, 5 );
 	
 	m_HsvBitmap = new wxStaticBitmap( sbSizerViewHSV->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 264,264 ), 0 );
 	m_HsvBitmap->SetMinSize( wxSize( 264,264 ) );
@@ -56,7 +56,7 @@ COLOR4D_PICKER_DLG_BASE::COLOR4D_PICKER_DLG_BASE( wxWindow* parent, wxWindowID i
 	sbSizerViewHSV->Add( m_HsvBitmap, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
 	
 	
-	sbSizerViewHSV->Add( 0, 0, 1, wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 );
+	sbSizerViewHSV->Add( 0, 0, 1, wxALIGN_CENTER_HORIZONTAL, 5 );
 	
 	
 	bSizerPanels->Add( sbSizerViewHSV, 1, wxEXPAND|wxBOTTOM, 5 );
diff --git a/common/widgets/color4Dpickerdlg_base.fbp b/common/widgets/color4Dpickerdlg_base.fbp
index 4cd84b603b..d483e07cc7 100644
--- a/common/widgets/color4Dpickerdlg_base.fbp
+++ b/common/widgets/color4Dpickerdlg_base.fbp
@@ -44,7 +44,7 @@
             <property name="minimum_size"></property>
             <property name="name">COLOR4D_PICKER_DLG_BASE</property>
             <property name="pos"></property>
-            <property name="size">707,406</property>
+            <property name="size">707,375</property>
             <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
             <property name="subclass">DIALOG_SHIM; dialog_shim.h</property>
             <property name="title">Color Picker</property>
@@ -291,7 +291,7 @@
                                                             <event name="OnUpdateUI"></event>
                                                             <object class="sizeritem" expanded="1">
                                                                 <property name="border">5</property>
-                                                                <property name="flag">wxEXPAND|wxALIGN_CENTER_HORIZONTAL</property>
+                                                                <property name="flag">wxALIGN_CENTER_HORIZONTAL</property>
                                                                 <property name="proportion">1</property>
                                                                 <object class="spacer" expanded="1">
                                                                     <property name="height">0</property>
@@ -382,7 +382,7 @@
                                                             </object>
                                                             <object class="sizeritem" expanded="1">
                                                                 <property name="border">5</property>
-                                                                <property name="flag">wxEXPAND|wxALIGN_CENTER_HORIZONTAL</property>
+                                                                <property name="flag">wxALIGN_CENTER_HORIZONTAL</property>
                                                                 <property name="proportion">1</property>
                                                                 <object class="spacer" expanded="1">
                                                                     <property name="height">0</property>
@@ -407,7 +407,7 @@
                                                             <event name="OnUpdateUI"></event>
                                                             <object class="sizeritem" expanded="1">
                                                                 <property name="border">5</property>
-                                                                <property name="flag">wxEXPAND|wxALIGN_CENTER_HORIZONTAL</property>
+                                                                <property name="flag">wxALIGN_CENTER_HORIZONTAL</property>
                                                                 <property name="proportion">1</property>
                                                                 <object class="spacer" expanded="1">
                                                                     <property name="height">0</property>
@@ -498,7 +498,7 @@
                                                             </object>
                                                             <object class="sizeritem" expanded="1">
                                                                 <property name="border">5</property>
-                                                                <property name="flag">wxEXPAND|wxALIGN_CENTER_HORIZONTAL</property>
+                                                                <property name="flag">wxALIGN_CENTER_HORIZONTAL</property>
                                                                 <property name="proportion">1</property>
                                                                 <object class="spacer" expanded="1">
                                                                     <property name="height">0</property>
diff --git a/common/widgets/color4Dpickerdlg_base.h b/common/widgets/color4Dpickerdlg_base.h
index 2a24863876..fdf3151849 100644
--- a/common/widgets/color4Dpickerdlg_base.h
+++ b/common/widgets/color4Dpickerdlg_base.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jul  2 2017)
+// C++ code generated with wxFormBuilder (version Aug  4 2017)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!
@@ -91,7 +91,7 @@ class COLOR4D_PICKER_DLG_BASE : public DIALOG_SHIM
 	
 	public:
 		
-		COLOR4D_PICKER_DLG_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Color Picker"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 707,406 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
+		COLOR4D_PICKER_DLG_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Color Picker"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 707,375 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
 		~COLOR4D_PICKER_DLG_BASE();
 	
 };
diff --git a/eeschema/lib_bezier.cpp b/eeschema/lib_bezier.cpp
index abb6085d32..8ea7784336 100644
--- a/eeschema/lib_bezier.cpp
+++ b/eeschema/lib_bezier.cpp
@@ -54,7 +54,8 @@ LIB_BEZIER::LIB_BEZIER( LIB_PART* aParent ) :
 
 bool LIB_BEZIER::Save( OUTPUTFORMATTER& aFormatter )
 {
-    aFormatter.Print( 0, "B %lu %d %d %d", m_BezierPoints.size(), m_Unit, m_Convert, m_Width );
+    aFormatter.Print( 0, "B %lu %d %d %d", (long unsigned)m_BezierPoints.size(),
+                      m_Unit, m_Convert, m_Width );
 
     for( const auto& pt : m_BezierPoints )
         aFormatter.Print( 0, " %d %d", pt.x, pt.y );