Fixed compilation issues on newer versions of cc