Tying up some loose ends for the EventSystem