tracker: some fixes