Fix build with GCC and -enable-werror / -Wpedantic....