Minor updates to multithreading (need to fix service)