Fixes for compiling with GCC.