More event trigger tweaks