Another g++ compiler patches