Fix issues with highlighting