Tweak for compatibility with gcc/clang