Fixed GCC compatibility issues