BUG: More multi-threading crashes fixed