Added more g++ fixes