discussion fixes