diff --git a/Include/Protocol/FSInjectProtocol.h b/Include/Protocol/FSInjectProtocol.h
index df788c7d8..4f91cc755 100644
--- a/Include/Protocol/FSInjectProtocol.h
+++ b/Include/Protocol/FSInjectProtocol.h
@@ -35,7 +35,7 @@ typedef FSI_STRING_LIST_ENTRY FSI_STRING_LIST;
  * @param ForceLoadKexts list of kexts (paths to their Info.plists, like L"\\ATI5000Controller.kext\\Contents\\Info.plist")
  *                       that we'll force to be loaded by boot.efi by changing OSBundleRequired to Root
  */
-typedef EFI_STATUS (EFIAPI * FSINJECTION_INSTALL)(IN EFI_HANDLE TgtHandle, IN CHAR16 *TgtDir, IN EFI_HANDLE SrcHandle, IN CHAR16 *SrcDir, IN FSI_STRING_LIST *Blacklist, IN FSI_STRING_LIST *ForceLoadKexts);
+typedef EFI_STATUS (EFIAPI * FSINJECTION_INSTALL)(IN EFI_HANDLE TgtHandle, IN JCONST CHAR16 *TgtDir, IN EFI_HANDLE SrcHandle, IN CHAR16 *SrcDir, IN FSI_STRING_LIST *Blacklist, IN FSI_STRING_LIST *ForceLoadKexts);
 
 /**
  * FSINJECTION_PROTOCOL.CreateStringList() type definition
@@ -51,7 +51,7 @@ typedef FSI_STRING_LIST* (EFIAPI *FSINJECTION_CREATE_STRING_LIST) (VOID);
  * @param String        String to add
  * @return List if ok, or NULL if no memory
  */
-typedef FSI_STRING_LIST* (EFIAPI *FSINJECTION_ADD_STRING_TO_LIST) (FSI_STRING_LIST *List, CHAR16 *String);
+typedef FSI_STRING_LIST* (EFIAPI *FSINJECTION_ADD_STRING_TO_LIST) (FSI_STRING_LIST *List, JCONST CHAR16 *String);
 
 
 /**
@@ -72,4 +72,4 @@ typedef struct _FSINJECTION_PROTOCOL {
 extern EFI_GUID gFSInjectProtocolGuid;
 
 
-#endif
\ No newline at end of file
+#endif
diff --git a/MdePkg/Include/Protocol/ComponentName.h b/MdePkg/Include/Protocol/ComponentName.h
old mode 100644
new mode 100755
index 14c1343d4..bcee2208d
--- a/MdePkg/Include/Protocol/ComponentName.h
+++ b/MdePkg/Include/Protocol/ComponentName.h
@@ -48,7 +48,7 @@ typedef
 EFI_STATUS
 (EFIAPI *EFI_COMPONENT_NAME_GET_DRIVER_NAME)(
   IN EFI_COMPONENT_NAME_PROTOCOL           *This,
-  IN  CHAR8                                *Language,
+  IN JCONST CHAR8                                *Language,
   OUT CHAR16                               **DriverName
   );
 
diff --git a/rEFIt_UEFI/refit/main.cpp b/rEFIt_UEFI/refit/main.cpp
index 949807b94..a4ee6d894 100644
--- a/rEFIt_UEFI/refit/main.cpp
+++ b/rEFIt_UEFI/refit/main.cpp
@@ -1748,7 +1748,7 @@ extern UINT8                           *gLanMmio[4];     // their MMIO regions
 extern UINT8                           gLanMac[4][6];    // their MAC addresses
 extern UINTN                           nLanPaths;        // number of LAN pathes
 
-BOOLEAN SetOEMPathIfExists(IN EFI_FILE *Root, IN CONST CHAR16 *path, CONST CHAR16 *ConfName)
+BOOLEAN SetOEMPathIfExists(IN EFI_FILE *Root, IN CHAR16 *path, CONST CHAR16 *ConfName)
 {
 	BOOLEAN res = FileExists(Root, path);
 	if ( res ) {
@@ -1756,7 +1756,7 @@ BOOLEAN SetOEMPathIfExists(IN EFI_FILE *Root, IN CONST CHAR16 *path, CONST CHAR1
 	  UnicodeSPrint(ConfigPath, sizeof(ConfigPath), L"%s\\%s.plist", path, ConfName);
 	  BOOLEAN res2 = FileExists(Root, ConfigPath);
 	  if ( res2 ) {
-	  	OEMPath = (CHAR16*)path;
+	  	OEMPath = path;
 	  	DBG ("CheckOEMPathExists: set OEMPath: %s\n", OEMPath);
 	  	return 1;
 	  }else{
@@ -1772,7 +1772,7 @@ BOOLEAN SetOEMPathIfExists(IN EFI_FILE *Root, IN CONST CHAR16 *path, CONST CHAR1
 
 VOID SetOEMPath(CONST CHAR16 *ConfName)
   {
-    OEMPath = L"EFI\\CLOVER";
+    OEMPath = PoolPrint(L"%s", L"EFI\\CLOVER");
     if (ConfName == NULL) {
       DBG ("set OEMPath (ConfName == NULL): %s\n", OEMPath);
     } else if ( nLanCards > 0   &&  SetOEMPathIfExists(SelfRootDir, PoolPrint(L"EFI\\CLOVER\\OEM\\%a--%02x-%02x-%02x-%02x-%02x-%02x", gSettings.OEMProduct, gLanMac[0][0], gLanMac[0][1], gLanMac[0][2], gLanMac[0][3], gLanMac[0][4], gLanMac[0][5]), ConfName)) {