Fixing GCC issues