Fix logging highlights and undefinedes