Fixed highlighting errors