Fixed compilation problems with GCC