Some highlighting improvements