tracking alerts fixes