3 files changed, 6 insertions, 5 deletions
diff --git a/xfa/fxfa/app/xfa_checksum.cpp b/xfa/fxfa/app/xfa_checksum.cpp
index aac5456b63..c76ec505e9 100644
--- a/xfa/fxfa/app/xfa_checksum.cpp
+++ b/xfa/fxfa/app/xfa_checksum.cpp
@@ -73,7 +73,7 @@ void CXFA_SAXReaderHandler::OnTagClose(void* pTag, uint32_t dwEndPos) {
   if (pSAXContext->m_eNode == FX_SAXNODE_Instruction) {
     textBuf << "?>";
   } else if (pSAXContext->m_eNode == FX_SAXNODE_Tag) {
-    textBuf << "></" << pSAXContext->m_bsTagName << ">";
+    textBuf << "></" << pSAXContext->m_bsTagName.AsByteStringC() << ">";
   }
   UpdateChecksum(FALSE);
 }
diff --git a/xfa/fxfa/app/xfa_fftextedit.cpp b/xfa/fxfa/app/xfa_fftextedit.cpp
index 085ec07d9f..fa530169e0 100644
--- a/xfa/fxfa/app/xfa_fftextedit.cpp
+++ b/xfa/fxfa/app/xfa_fftextedit.cpp
@@ -420,13 +420,13 @@ FWL_ERR CXFA_FFTextEdit::OnProcessEvent(CFWL_Event* pEvent) {
     case FWL_EVTHASH_EDT_CheckWord: {
       CFX_WideString wstr(L"FWL_EVENT_DTP_SelectChanged");
       CFWL_EvtEdtCheckWord* event = (CFWL_EvtEdtCheckWord*)pEvent;
-      event->bCheckWord = CheckWord(event->bsWord);
+      event->bCheckWord = CheckWord(event->bsWord.AsByteStringC());
       break;
     }
     case FWL_EVTHASH_EDT_GetSuggestWords: {
       CFWL_EvtEdtGetSuggestWords* event = (CFWL_EvtEdtGetSuggestWords*)pEvent;
-      event->bSuggestWords =
-          GetSuggestWords(event->bsWord, event->bsArraySuggestWords);
+      event->bSuggestWords = GetSuggestWords(event->bsWord.AsByteStringC(),
+                                             event->bsArraySuggestWords);
       break;
     }
     default: {}
diff --git a/xfa/fxfa/app/xfa_fontmgr.cpp b/xfa/fxfa/app/xfa_fontmgr.cpp
index e915dcbaf7..b9cfd6fb28 100644
--- a/xfa/fxfa/app/xfa_fontmgr.cpp
+++ b/xfa/fxfa/app/xfa_fontmgr.cpp
@@ -1861,7 +1861,8 @@ IFX_Font* CXFA_PDFFontMgr::FindFont(CFX_ByteString strPsName,
   for (const auto& it : *pFontSetDict) {
     const CFX_ByteString& key = it.first;
     CPDF_Object* pObj = it.second;
-    if (!PsNameMatchDRFontName(strPsName, bBold, bItalic, key, bStrictMatch)) {
+    if (!PsNameMatchDRFontName(strPsName.AsByteStringC(), bBold, bItalic, key,
+                               bStrictMatch)) {
       continue;
     }
     CPDF_Object* pDirect = pObj->GetDirect();