comp: Improve thread safety. Resolve issues in mutlithreading CTS.