Fix some event issues