Trigger fixes