Tweaks on events