Trigger fixes.