- More threading fixes