NoTrigger: minor updates