diff --git a/pcbnew/class_zone.cpp b/pcbnew/class_zone.cpp
index f60f010b84..ee91511438 100644
--- a/pcbnew/class_zone.cpp
+++ b/pcbnew/class_zone.cpp
@@ -107,6 +107,12 @@ ZONE_CONTAINER::ZONE_CONTAINER( const ZONE_CONTAINER& aZone ) :
     m_hatchPitch = aZone.m_hatchPitch;
     m_HatchLines = aZone.m_HatchLines;
 
+    m_HatchFillTypeThickness = aZone.m_HatchFillTypeThickness;
+    m_HatchFillTypeGap = aZone.m_HatchFillTypeGap;
+    m_HatchFillTypeOrientation = aZone.m_HatchFillTypeOrientation;
+    m_HatchFillTypeSmoothingLevel = aZone.m_HatchFillTypeSmoothingLevel;
+    m_HatchFillTypeSmoothingValue = aZone.m_HatchFillTypeSmoothingValue;
+
     SetLayerSet( aZone.GetLayerSet() );
     SetLocalFlags( aZone.GetLocalFlags() );
 
@@ -138,6 +144,12 @@ ZONE_CONTAINER& ZONE_CONTAINER::operator=( const ZONE_CONTAINER& aOther )
     m_FillSegmList.clear();
     m_FillSegmList = aOther.m_FillSegmList;
 
+    m_HatchFillTypeThickness = aOther.m_HatchFillTypeThickness;
+    m_HatchFillTypeGap = aOther.m_HatchFillTypeGap;
+    m_HatchFillTypeOrientation = aOther.m_HatchFillTypeOrientation;
+    m_HatchFillTypeSmoothingLevel = aOther.m_HatchFillTypeSmoothingLevel;
+    m_HatchFillTypeSmoothingValue = aOther.m_HatchFillTypeSmoothingValue;
+
     SetLayerSet( aOther.GetLayerSet() );
 
     return *this;
diff --git a/pcbnew/dialogs/dialog_copper_zones.cpp b/pcbnew/dialogs/dialog_copper_zones.cpp
index f5e80f4db2..3521359655 100644
--- a/pcbnew/dialogs/dialog_copper_zones.cpp
+++ b/pcbnew/dialogs/dialog_copper_zones.cpp
@@ -302,8 +302,7 @@ bool DIALOG_COPPER_ZONE::AcceptOptions( bool aUseExportableSetupOnly )
     if( !m_spokeWidth.Validate( 0, INT_MAX ) )
         return false;
 
-    if( !m_gridStyleRotation.Validate( -1800, 1800 ) )
-        return false;
+    m_gridStyleRotation.SetValue( NormalizeAngle180( m_gridStyleRotation.GetValue() ) );
 
     if( m_settings.m_FillMode == ZFM_HATCH_PATTERN )
     {