Fix graceful shutdown handling of Thread* models harder