A few random fixes and Disqus won the coin toss. Fixes #6