Added fixed links as per disqus comments