More triggers fixes.