Fixes in Multi threaded...