Fixed some events