Fix-ups for events system