Track in progress fixes