Small tweaks on events