Fix comment reset, assorted