Again, fixed some of disqus' issues