Minor updates on tracking