FIX: fixups std::string rfind + npos