diff --git a/libs/kimath/src/convert_basic_shapes_to_polygon.cpp b/libs/kimath/src/convert_basic_shapes_to_polygon.cpp
index 0627a6a98b..a5e1710d53 100644
--- a/libs/kimath/src/convert_basic_shapes_to_polygon.cpp
+++ b/libs/kimath/src/convert_basic_shapes_to_polygon.cpp
@@ -390,12 +390,12 @@ void TransformArcToPolygon( SHAPE_POLY_SET& aCornerBuffer, wxPoint aStart, wxPoi
     // The final shape is much better.
     double arc_angle_end_deg = arc.GetStartAngle();
 
-    if( arc_angle_end_deg != 0 & arc_angle_end_deg != 180.0 )
+    if( arc_angle_end_deg != 0 && arc_angle_end_deg != 180.0 )
         polyshape.Outline(0).Rotate( arc_angle_end_deg * M_PI/180.0, arcSpine.GetPoint( 0 ) );
 
     arc_angle_end_deg = arc.GetEndAngle();
 
-    if( arc_angle_end_deg != 0 & arc_angle_end_deg != 180.0 )
+    if( arc_angle_end_deg != 0 && arc_angle_end_deg != 180.0 )
         polyshape.Outline(1).Rotate( arc_angle_end_deg * M_PI/180.0, arcSpine.GetPoint( -1 ) );
 
     if( aErrorLoc == ERROR_OUTSIDE )
diff --git a/pcbnew/tools/drawing_tool.cpp b/pcbnew/tools/drawing_tool.cpp
index e9989908d1..64025d098a 100644
--- a/pcbnew/tools/drawing_tool.cpp
+++ b/pcbnew/tools/drawing_tool.cpp
@@ -157,8 +157,8 @@ DRAWING_TOOL::DRAWING_TOOL() :
     m_board( nullptr ),
     m_frame( nullptr ),
     m_mode( MODE::NONE ),
-    m_lineWidth( 1 ),
-    m_inDrawingTool( false )
+    m_inDrawingTool( false ),
+    m_lineWidth( 1 )
 {
 }