Replaced some char * with std::string