More event trigger fixes