Some minor thread changes