Fix some event target issue