Fix build failures discovered by an upcoming gcc-14 release (#1730)

Fix build failures discovered by an upcoming gcc-14 release (#1730) #158