more event system fixes