run2-patches fixes for gcc12

Mark Smith requested to merge run2-patches-gcc12-fixes into run2-patches Apr 28, 2023