Updates for latest gcc