Code highlighting fixes