- Thread fixes