Fixed more highlighting issues.