Cleanup / fixing highlights