Fix broken events