Small fixes for the comments system