Fixed minor bugs with the event controller