Fixes to make in compile under some version of GCC.