Discussion bug fixes

* Fixes #4503 
* Fixes #4113 
![Small things](http://stream1.gifsoup.com/view5/2718689/blink-182-all-the-small-things-o.gif)