Fixed more highlighting errors