Port more track API
More fixes