diff --git a/CMakeLists.txt b/CMakeLists.txt
index a5b0e85043b..2cd51d1f364 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1788,7 +1788,6 @@ if(CMAKE_COMPILER_IS_GNUCC)
     # The crashes can be resolved by disabling the flag per module (but not via pragmas).
     # However this also causes a type mix-up FreeStyle  (Blender & FreeStyle's `Curve`)
     # so it seems to impact GCC's the internal state enough that it's too risky to enable.
-    # Once this flag has been removed for the modules where this occurs.
     # When this is resolved the check can be enabled for fixed GCC versions.
     #
     # Prevents linking errors with MSVC.
diff --git a/intern/ghost/intern/GHOST_SystemX11.cc b/intern/ghost/intern/GHOST_SystemX11.cc
index 10951917c06..107d18c676a 100644
--- a/intern/ghost/intern/GHOST_SystemX11.cc
+++ b/intern/ghost/intern/GHOST_SystemX11.cc
@@ -291,7 +291,7 @@ uint64_t GHOST_SystemX11::getMilliSeconds() const
 
 uint64_t GHOST_SystemX11::ms_from_input_time(const Time timestamp) const
 {
-  GHOST_ASSERT(timestamp >= m_start_time_monotonic, "Invalid time-stemp");
+  GHOST_ASSERT(timestamp >= m_start_time_monotonic, "Invalid time-stamp");
   /* NOTE(@ideasman42): Return a time compatible with `getMilliSeconds()`,
    * this is needed as X11 time-stamps use monotonic time.
    * The X11 implementation *could* use any basis, in practice though we are supporting
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.cc b/source/blender/draw/engines/gpencil/gpencil_engine.cc
index 6634e5d4f68..6d49f808b41 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.cc
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.cc
@@ -383,7 +383,6 @@ static void gpencil_render_to_image(void * /*vedata*/,
 
   Render *render = engine->re;
   Depsgraph *depsgraph = DRW_context_state_get()->depsgraph;
-  Scene *scene = DRW_context_state_get()->scene;
   Object *camera_original_ob = RE_GetCamera(render);
   const char *viewname = RE_GetActiveRenderView(render);
   const int2 render_resolution = int2(engine->resolution_x, engine->resolution_y);