add event fixes