tracker trigger fixes