Fix string highlighting issues