Added stuff to prevent flair and source commenting bugs.