Fix 22tracks issues.