Fixed the issue of joining a non-joinable thread in all places where that happens.