Assorted fixes for comments