Fix problems with inter_thread_comm.