Small fixes and highlighting provider fix.