Discussion fixes