- Fixed compilation errors with GCC