diff --git a/pcbnew/board_stackup_manager/board_stackup_reporter.cpp b/pcbnew/board_stackup_manager/board_stackup_reporter.cpp
index b9cf08fe1c..79576c8ce1 100644
--- a/pcbnew/board_stackup_manager/board_stackup_reporter.cpp
+++ b/pcbnew/board_stackup_manager/board_stackup_reporter.cpp
@@ -57,6 +57,12 @@ wxString BuildStackupReport( BOARD_STACKUP& aStackup, EDA_UNITS_T aUnits )
         txt.Printf( "layer \"%s\" type \"%s\"", item->GetLayerName(), item->GetTypeName() );
         report << txt;
 
+        if( item->IsMaterialEditable() )
+        {
+            txt.Printf( " Material \"%s\"", item->GetMaterial() );
+            report << txt;
+        }
+
         if( item->HasEpsilonRValue() )
         {
             txt.Printf( " EpsilonR %s", item->FormatEpsilonR() );
@@ -69,18 +75,6 @@ wxString BuildStackupReport( BOARD_STACKUP& aStackup, EDA_UNITS_T aUnits )
             report << txt;
         }
 
-        if( item->IsMaterialEditable() )
-        {
-            txt.Printf( " Material \"%s\"", item->GetMaterial() );
-            report << txt;
-        }
-
-        if( item->GetType() == BS_ITEM_TYPE_DIELECTRIC )
-        {
-            txt.Printf( " \"%s\"", item->GetTypeName() );
-            report << txt;
-        }
-
         if( item->IsThicknessEditable() )
         {
             txt.Printf( " Thickness %s",
diff --git a/pcbnew/board_stackup_manager/panel_board_stackup.cpp b/pcbnew/board_stackup_manager/panel_board_stackup.cpp
index 38d6985fd4..11aece6737 100644
--- a/pcbnew/board_stackup_manager/panel_board_stackup.cpp
+++ b/pcbnew/board_stackup_manager/panel_board_stackup.cpp
@@ -170,7 +170,7 @@ void PANEL_SETUP_BOARD_STACKUP::onAddDielectricLayer( wxCommandEvent& event )
 void PANEL_SETUP_BOARD_STACKUP::onRemoveDielectricLayer( wxCommandEvent& event )
 {
     // Build deletable Dielectric layers list.
-    // A lyer can be deleted if there are 2 (or more) dielectric layers
+    // A layer can be deleted if there are 2 (or more) dielectric layers
     // between 2 copper layers
     wxArrayString d_list;
     wxString previousD_Layer;
@@ -576,7 +576,7 @@ void PANEL_SETUP_BOARD_STACKUP::buildLayerStackPanel()
         }
         else
         {
-            item->GetLayerName() = m_board->GetLayerName( item->GetBrdLayerId() );
+            item->SetLayerName( m_board->GetLayerName( item->GetBrdLayerId() ) );
             wxStaticText* st_text =  new wxStaticText( m_scGridWin, wxID_ANY, item->GetLayerName() );
             m_fgGridSizer->Add( st_text, 0, wxALL|wxALIGN_CENTER_VERTICAL, 1 );
             st_text->Show( show_item );