Global track fixes