Fix a few broken tracks