Fixes to comments, discussion urls etc