Changes to work with latest module_mutual_thread_comm version