Fix thread_wrapper (removal of start/stop)