Fix build issues in mac
commit after merge
use mutex from only std::