Fixing highlighting a bit.