gcc patch #131743:  2 fixes