Advisory fix and event label update