Attempt to fix build errors on older GCC versions