Remove bugs in some events