event fixes [ci skip]