Fixed some issues with GCC.