diff --git a/clang/lib/DPCT/AnalysisInfo.cpp b/clang/lib/DPCT/AnalysisInfo.cpp
index 51edc4521b60..52ba41ef0bcb 100644
--- a/clang/lib/DPCT/AnalysisInfo.cpp
+++ b/clang/lib/DPCT/AnalysisInfo.cpp
@@ -1860,7 +1860,7 @@ void DpctGlobalInfo::processCudaArchMacro() {
 }
 
 void DpctGlobalInfo::generateHostCode(tooling::Replacements &ProcessedReplList,
-                                      HostDeviceFuncLocInfo Info, unsigned ID) {
+                                      HostDeviceFuncLocInfo &Info, unsigned ID) {
   std::vector<std::shared_ptr<ExtReplacement>> ExtraRepl;
 
   unsigned int Pos, Len;
diff --git a/clang/lib/DPCT/AnalysisInfo.h b/clang/lib/DPCT/AnalysisInfo.h
index 4da25b65914f..5facfcc92bec 100644
--- a/clang/lib/DPCT/AnalysisInfo.h
+++ b/clang/lib/DPCT/AnalysisInfo.h
@@ -1107,7 +1107,7 @@ class DpctGlobalInfo {
   void buildReplacements();
   void processCudaArchMacro();
   void generateHostCode(tooling::Replacements &ProcessedReplList,
-                        HostDeviceFuncLocInfo Info, unsigned ID);
+                        HostDeviceFuncLocInfo &Info, unsigned ID);
   void postProcess();
   void cacheFileRepl(clang::tooling::UnifiedPath FilePath,
                      std::pair<std::shared_ptr<ExtReplacements>,
diff --git a/clang/lib/Lex/PPDirectives.cpp b/clang/lib/Lex/PPDirectives.cpp
index b78e3f12864a..a8554afd0999 100644
--- a/clang/lib/Lex/PPDirectives.cpp
+++ b/clang/lib/Lex/PPDirectives.cpp
@@ -1136,7 +1136,12 @@ Preprocessor::LookupEmbedFile(StringRef Filename, bool isAngled, bool OpenFile,
     SeparateComponents(LookupPath, Entry, Filename, false);
     llvm::Expected<FileEntryRef> ShouldBeEntry =
         FM.getFileRef(LookupPath, OpenFile);
+#ifdef SYCLomatic_CUSTOMIZATION
+    if(auto Result = llvm::expectedToOptional(std::move(ShouldBeEntry)))
+      return Result;
+#else
     return llvm::expectedToOptional(std::move(ShouldBeEntry));
+#endif //SYCLomatic_CUSTOMIZATION
   }
   return std::nullopt;
 }