Fix some NTK thread issues