Make the code/build compatible with older GCC