Some apiEvent improvements