diff --git a/common/convert_basic_shapes_to_polygon.cpp b/common/convert_basic_shapes_to_polygon.cpp
index ada3982593..e9ecc555d5 100644
--- a/common/convert_basic_shapes_to_polygon.cpp
+++ b/common/convert_basic_shapes_to_polygon.cpp
@@ -58,9 +58,7 @@ void CopyPolygonsFromKiPolygonListToPolysList( KI_POLYGON_SET&  aKiPolyList,
             aPolysList.push_back( corner );
         }
 
-        corner.end_contour = true;
-        aPolysList.pop_back();
-        aPolysList.push_back( corner );
+        aPolysList.back().end_contour = true;
     }
 }
 
diff --git a/eeschema/edit_bitmap.cpp b/eeschema/edit_bitmap.cpp
index 312edcff7c..4ff2aeac24 100644
--- a/eeschema/edit_bitmap.cpp
+++ b/eeschema/edit_bitmap.cpp
@@ -93,7 +93,7 @@ static void moveBitmap( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aPosit
     }
 
     // Draw the bitmap at it's new position.
-    image->Move( screen->GetCrossHairPosition() );
+    image->SetPosition( screen->GetCrossHairPosition() );
     image->Draw( aPanel, aDC, wxPoint( 0, 0 ), GR_DEFAULT_DRAWMODE );
 }