Work on some threaded related crashes.