Fix some bug events