diff --git a/reactos/base/services/eventlog/eventlog.h b/reactos/base/services/eventlog/eventlog.h
index dae03d69ed4..5328e9d8dc4 100644
--- a/reactos/base/services/eventlog/eventlog.h
+++ b/reactos/base/services/eventlog/eventlog.h
@@ -154,7 +154,7 @@ PBYTE LogfAllocAndBuildNewRecord(LPDWORD lpRecSize,
 						 DWORD dwDataSize,
 						 LPVOID lpRawData);
 
-inline void LogfFreeRecord(LPVOID Rec);
+void __inline LogfFreeRecord(LPVOID Rec);
 
 /* eventlog.c */
 VOID PRINT_HEADER(PFILE_HEADER header);
diff --git a/reactos/base/services/eventlog/file.c b/reactos/base/services/eventlog/file.c
index 16529d07772..3b2e2dbec40 100644
--- a/reactos/base/services/eventlog/file.c
+++ b/reactos/base/services/eventlog/file.c
@@ -859,7 +859,7 @@ PBYTE LogfAllocAndBuildNewRecord(LPDWORD lpRecSize,
 	return Buffer;
 }
 
-inline void LogfFreeRecord(LPVOID Rec)
+void __inline LogfFreeRecord(LPVOID Rec)
 {
 	HeapFree(MyHeap, 0, Rec);
 }
diff --git a/reactos/base/services/eventlog/rpc.c b/reactos/base/services/eventlog/rpc.c
index 2aca558542d..4dcbb99c7d1 100644
--- a/reactos/base/services/eventlog/rpc.c
+++ b/reactos/base/services/eventlog/rpc.c
@@ -22,8 +22,11 @@ DWORD STDCALL RpcThreadRoutine(LPVOID lpParameter)
         DPRINT("RpcServerUseProtseqEpW() failed (Status %lx)\n", Status);
         return 0;
     }
-
+#ifdef _MSC_VER
+    Status = RpcServerRegisterIf(eventlog_v0_0_s_ifspec, NULL, NULL);
+#else
     Status = RpcServerRegisterIf(eventlog_ServerIfHandle, NULL, NULL);
+#endif
     
     if(Status != RPC_S_OK)
     {
@@ -121,10 +124,10 @@ NTSTATUS ElfrOpenELW(
 
 		
 /* Function 8 */
-NTSTATUS ElfrRegisterEventSourceA( 
-    /* [unique][in] */ LPSTR ServerName,
-    /* [in] */ PANSI_STRING LogName,
-    /* [in] */ PANSI_STRING NullStr,
+NTSTATUS ElfrRegisterEventSourceW( 
+    /* [unique][in] */ LPWSTR ServerName,
+    /* [in] */ PUNICODE_STRING LogName,
+    /* [in] */ PUNICODE_STRING NullStr,
     /* [in] */ long MajorVer,
     /* [in] */ long MinorVer,
     /* [out] */ PLOGHANDLE Handle)
@@ -224,7 +227,7 @@ NTSTATUS ElfrOpenELA(
 	if(ServerName && 
 		!RtlCreateUnicodeStringFromAsciiz(&servername, ServerName))
 	{
-		RtlFreeUnicodeString(&servername);
+        RtlFreeUnicodeString(&logname);
 		return STATUS_NO_MEMORY;
 	}