Further fixed tracking issues