diff --git a/sdk/include/reactos/imm32_undoc.h b/sdk/include/reactos/imm32_undoc.h
index e08c9ca7842..5897579654a 100644
--- a/sdk/include/reactos/imm32_undoc.h
+++ b/sdk/include/reactos/imm32_undoc.h
@@ -170,10 +170,9 @@ C_ASSERT(sizeof(CLIENTIMC) == 0x34);
 /* flags for CLIENTIMC */
 #define CLIENTIMC_WIDE 0x1
 #define CLIENTIMC_ACTIVE 0x2
-#define CLIENTIMC_UNKNOWN4 0x20
 #define CLIENTIMC_DESTROY 0x40
 #define CLIENTIMC_DISABLEIME 0x80
-#define CLIENTIMC_UNKNOWN2 0x100
+#define CLIENTIMC_LOCKED 0x100
 
 PCLIENTIMC WINAPI ImmLockClientImc(_In_ HIMC hImc);
 VOID WINAPI ImmUnlockClientImc(_Inout_ PCLIENTIMC pClientImc);
diff --git a/win32ss/user/imm32/imm.c b/win32ss/user/imm32/imm.c
index b45080cf558..4a220a37d26 100644
--- a/win32ss/user/imm32/imm.c
+++ b/win32ss/user/imm32/imm.c
@@ -690,9 +690,9 @@ Imm32DestroyInputContext(HIMC hIMC, HKL hKL, BOOL bKeep)
         goto Finish;
     }
 
-    if ((pClientImc->dwFlags & CLIENTIMC_UNKNOWN2) && !bKeep)
+    if ((pClientImc->dwFlags & CLIENTIMC_LOCKED) && !bKeep)
     {
-        ERR("Can't destroy for CLIENTIMC_UNKNOWN2\n");
+        ERR("Can't destroy for CLIENTIMC_LOCKED\n");
         return FALSE;
     }
 
@@ -988,7 +988,7 @@ ImmLockClientImc(_In_ HIMC hImc)
         return NULL;
     }
 
-    pClientImc->dwFlags |= CLIENTIMC_UNKNOWN2;
+    pClientImc->dwFlags |= CLIENTIMC_LOCKED;
 
 Finish:
     InterlockedIncrement(&pClientImc->cLockObj);
diff --git a/win32ss/user/imm32/install.c b/win32ss/user/imm32/install.c
index a7e3e6dd06e..37e9ff4e0c0 100644
--- a/win32ss/user/imm32/install.c
+++ b/win32ss/user/imm32/install.c
@@ -175,7 +175,7 @@ Imm32AssignNewLayout(
         }
     }
 
-    return (HKL)LongToHandle(MAKELONG(wLangID, nID));
+    return UlongToHandle(MAKELONG(wLangID, nID));
 }
 
 static UINT