threading fixes :S