Fix up highlight, hl-line, modeline