Fix Hayako characterization
Fix Hayako refs