Fixes for std::string