Tweaks for triggers