gcc patch #131174:  2 fixes