Fix Discuss

Fix regressions introduced in 91a6be4