Fix for event targets and flagging FEND-1281