Fixing some triggers