diff --git a/3d-viewer/3d_canvas.cpp b/3d-viewer/3d_canvas.cpp
index 36a40b8c4b..56afe767c9 100644
--- a/3d-viewer/3d_canvas.cpp
+++ b/3d-viewer/3d_canvas.cpp
@@ -336,69 +336,58 @@ void EDA_3D_CANVAS::OnRightClick( wxMouseEvent& event )
     wxPoint     pos;
     wxMenu      PopUpMenu;
 
-    pos.x = event.GetX(); pos.y = event.GetY();
-    wxMenuItem* item = new wxMenuItem( &PopUpMenu, ID_POPUP_ZOOMIN,
-                                      _( "Zoom +" ) );
+    pos.x = event.GetX();
+    pos.y = event.GetY();
+
+    wxMenuItem* item = new wxMenuItem( &PopUpMenu, ID_POPUP_ZOOMIN, _( "Zoom +" ) );
     item->SetBitmap( KiBitmap( zoom_in_xpm ));
     PopUpMenu.Append( item );
 
-    item = new wxMenuItem( &PopUpMenu, ID_POPUP_ZOOMOUT,
-                          _( "Zoom -" ) );
+    item = new wxMenuItem( &PopUpMenu, ID_POPUP_ZOOMOUT, _( "Zoom -" ) );
     item->SetBitmap( KiBitmap( zoom_out_xpm ));
     PopUpMenu.Append( item );
 
     PopUpMenu.AppendSeparator();
-    item = new wxMenuItem( &PopUpMenu, ID_POPUP_VIEW_ZPOS,
-                          _( "Top View" ) );
+    item = new wxMenuItem( &PopUpMenu, ID_POPUP_VIEW_ZPOS, _( "Top View" ) );
     item->SetBitmap( KiBitmap( axis3d_top_xpm ));
     PopUpMenu.Append( item );
 
-    item = new wxMenuItem( &PopUpMenu, ID_POPUP_VIEW_ZNEG,
-                          _( "Bottom View" ) );
+    item = new wxMenuItem( &PopUpMenu, ID_POPUP_VIEW_ZNEG, _( "Bottom View" ) );
     item->SetBitmap( KiBitmap( axis3d_bottom_xpm ));
     PopUpMenu.Append( item );
 
     PopUpMenu.AppendSeparator();
-    item = new wxMenuItem( &PopUpMenu, ID_POPUP_VIEW_XPOS,
-                          _( "Right View" ) );
+    item = new wxMenuItem( &PopUpMenu, ID_POPUP_VIEW_XPOS, _( "Right View" ) );
     item->SetBitmap( KiBitmap( axis3d_right_xpm ));
     PopUpMenu.Append( item );
 
-    item = new wxMenuItem( &PopUpMenu, ID_POPUP_VIEW_XNEG,
-                          _( "Left View" ) );
+    item = new wxMenuItem( &PopUpMenu, ID_POPUP_VIEW_XNEG, _( "Left View" ) );
     item->SetBitmap( KiBitmap( axis3d_left_xpm ));
     PopUpMenu.Append( item );
 
-
     PopUpMenu.AppendSeparator();
-    item = new wxMenuItem( &PopUpMenu, ID_POPUP_VIEW_YPOS,
-                          _( "Front View" ) );
+    item = new wxMenuItem( &PopUpMenu, ID_POPUP_VIEW_YPOS, _( "Front View" ) );
     item->SetBitmap( KiBitmap( axis3d_front_xpm ));
     PopUpMenu.Append( item );
 
-    item = new wxMenuItem( &PopUpMenu, ID_POPUP_VIEW_YNEG,
-                          _( "Back View" ) );
+    item = new wxMenuItem( &PopUpMenu, ID_POPUP_VIEW_YNEG, _( "Back View" ) );
     item->SetBitmap( KiBitmap( axis3d_back_xpm ));
     PopUpMenu.Append( item );
 
     PopUpMenu.AppendSeparator();
-    item = new wxMenuItem( &PopUpMenu, ID_POPUP_MOVE3D_LEFT,
-                          _( "Move left <-" ) );
+    item = new wxMenuItem( &PopUpMenu, ID_POPUP_MOVE3D_LEFT, _( "Move left <-" ) );
     item->SetBitmap( KiBitmap( left_xpm ));
     PopUpMenu.Append( item );
 
-    item = new wxMenuItem( &PopUpMenu, ID_POPUP_MOVE3D_RIGHT,
-                          _( "Move right ->" ) );
+    item = new wxMenuItem( &PopUpMenu, ID_POPUP_MOVE3D_RIGHT, _( "Move right ->" ) );
     item->SetBitmap( KiBitmap( right_xpm ));
     PopUpMenu.Append( item );
 
-    item = new wxMenuItem( &PopUpMenu, ID_POPUP_MOVE3D_UP,
-                          _( "Move Up ^" ) );
+    item = new wxMenuItem( &PopUpMenu, ID_POPUP_MOVE3D_UP, _( "Move Up ^" ) );
     item->SetBitmap( KiBitmap( up_xpm ));
     PopUpMenu.Append( item );
 
-    item = new wxMenuItem( &PopUpMenu, ID_POPUP_MOVE3D_DOWN,
-                          _( "Move Down" ) );
+    item = new wxMenuItem( &PopUpMenu, ID_POPUP_MOVE3D_DOWN, _( "Move Down" ) );
     item->SetBitmap( KiBitmap( down_xpm ));
     PopUpMenu.Append( item );
 
diff --git a/bitmap2component/bitmap2component.cpp b/bitmap2component/bitmap2component.cpp
index 21a4dd4f03..3da52dfea8 100644
--- a/bitmap2component/bitmap2component.cpp
+++ b/bitmap2component/bitmap2component.cpp
@@ -315,7 +315,7 @@ void BITMAPCONV_INFO::OuputOnePolygon( KPolygon & aPolygon )
         int width = 1;
         fprintf( m_Outfile, "DP %d %d %d %d %d %d %d\n",
                  0, 0, 0, 0,
-                 aPolygon.size() + 1, width, layer );
+                 (int) aPolygon.size() + 1, width, layer );
 
         for( ii = 0; ii < aPolygon.size(); ii++ )
         {
@@ -331,7 +331,7 @@ void BITMAPCONV_INFO::OuputOnePolygon( KPolygon & aPolygon )
     break;
 
     case EESCHEMA_FMT:
-        fprintf( m_Outfile, "P %d 0 0 1", aPolygon.size() + 1 );
+        fprintf( m_Outfile, "P %d 0 0 1", (int) aPolygon.size() + 1 );
         for( ii = 0; ii < aPolygon.size(); ii++ )
         {
             currpoint = *(aPolygon.begin() + ii);