Fix more compile error/warnings for gcc-13

No match.