Some clang compilation fixes
Some clang compilation fixes
Added string to std::string conversion method