Bad comment form link

Also some missing changes from the #505 sequence