Fix conversion warnings for event refactor