Fix compile issues with GCC