User track fixes