Fix bugs, in hl-comment and window-number.