Fix thread helper support