diff --git a/gerbview/gerbview_settings.cpp b/gerbview/gerbview_settings.cpp
index c9b04622b3..bb21052cc2 100644
--- a/gerbview/gerbview_settings.cpp
+++ b/gerbview/gerbview_settings.cpp
@@ -1,7 +1,7 @@
 /*
 * This program source code file is part of KiCad, a free EDA CAD application.
 *
-* Copyright (C) 2021-2022 KiCad Developers, see AUTHORS.txt for contributors.
+* Copyright (C) 2021-2024 KiCad Developers, see AUTHORS.txt for contributors.
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -53,6 +53,9 @@ GERBVIEW_SETTINGS::GERBVIEW_SETTINGS() :
     m_params.emplace_back( new PARAM<wxString>( "appearance.page_type",
             &m_Appearance.page_type, "GERBER" ) );
 
+    m_params.emplace_back( new PARAM<bool>( "appearance.show_page_limit",
+            &m_Display.m_DisplayPageLimits, false ) );
+
     m_params.emplace_back( new PARAM_LIST<wxString>( "system.drill_file_history",
             &m_DrillFileHistory, {} ) );
 
diff --git a/pcbnew/exporters/gendrill_gerber_writer.cpp b/pcbnew/exporters/gendrill_gerber_writer.cpp
index 9fdd4aff55..18afd53f9f 100644
--- a/pcbnew/exporters/gendrill_gerber_writer.cpp
+++ b/pcbnew/exporters/gendrill_gerber_writer.cpp
@@ -134,7 +134,7 @@ bool GERBER_WRITER::CreateDrillandMapFilesSet( const wxString& aPlotDirectory, b
 
 #if !FLASH_OVAL_HOLE
 // A helper class to transform an oblong hole to a segment
-static void convertOblong2Segment( VECTOR2I& aSize, const EDA_ANGLE& aOrient, VECTOR2I& aStart, VECTOR2I& aEnd );
+static void convertOblong2Segment( const VECTOR2I& aSize, const EDA_ANGLE& aOrient, VECTOR2I& aStart, VECTOR2I& aEnd );
 #endif
 
 
@@ -267,7 +267,7 @@ int GERBER_WRITER::createDrillFile( wxString& aFullFilename, bool aIsNpth,
 
 
 #if !FLASH_OVAL_HOLE
-void convertOblong2Segment( VECTOR2I& aSize, const EDA_ANGLE& aOrient, VECTOR2I& aStart,
+void convertOblong2Segment( const VECTOR2I& aSize, const EDA_ANGLE& aOrient, VECTOR2I& aStart,
                             VECTOR2I& aEnd )
 {
     VECTOR2I    size( aSize );