diff --git a/gerbview/rs274x.cpp b/gerbview/rs274x.cpp
index 7cbd4c4e9e..d866bf811d 100644
--- a/gerbview/rs274x.cpp
+++ b/gerbview/rs274x.cpp
@@ -541,7 +541,7 @@ bool GERBER_IMAGE::ExecuteRS274XCommand( int       command,
         else
             GetLayerParams().m_LayerNegative = false;
         D( printf( "%22s: LAYER_POLARITY m_LayerNegative=%s\n", __func__,
-                   m_LayerNegative ? "true" : "false" ); )
+                   GetLayerParams().m_LayerNegative ? "true" : "false" ); )
         break;
 
     case INCLUDE_FILE:
diff --git a/pcbnew/export_gencad.cpp b/pcbnew/export_gencad.cpp
index eb2acafa13..03012ee950 100644
--- a/pcbnew/export_gencad.cpp
+++ b/pcbnew/export_gencad.cpp
@@ -239,7 +239,7 @@ void CreatePadsShapesSection( FILE* file, BOARD* pcb )
             fprintf( file, " %s %d\n", pad_type, pad->m_Drill.x );
             fprintf( file, "RECTANGLE %d %d %d %d\n",
                      pad->m_Offset.x - dx, -(pad->m_Offset.y - dy),
-                     pad->m_Offset.x + dx, -(pad->m_Offset.y + dy) );
+                     pad->m_Size.x, pad->m_Size.y );
             break;
 
         case PAD_OVAL:     /* Create outline by 2 lines and 2 arcs */