More hacks to get highlighting working