Fixed event references