Fix for newer compilers