diff --git a/dlls/common/common.h b/dlls/common/common.h
index 5aedfcc..af33485 100644
--- a/dlls/common/common.h
+++ b/dlls/common/common.h
@@ -2,4 +2,4 @@
 #define RtlSetLastWin32ErrorAndNtStatusFromNtStatus(Status) \
     SetLastError(RtlNtStatusToDosError(Status))
 #define RtlGetLastWin32ErrorAndNtStatusFromNtStatus(Status) \
-    GetLastError(RtlNtStatusToDosError(Status))
\ No newline at end of file
+    (SetLastError(RtlNtStatusToDosError(Status)), GetLastError())
diff --git a/dlls/kernelx/kernelx.cpp b/dlls/kernelx/kernelx.cpp
index b056869..e58343d 100644
--- a/dlls/kernelx/kernelx.cpp
+++ b/dlls/kernelx/kernelx.cpp
@@ -229,7 +229,7 @@ void GetSystemOSVersion_X(LPSYSTEMOSVERSIONINFO VersionInformation) {
     int edx = cpuInfo[3];
 
     VersionInformation->MajorVersion = LOBYTE(ebx);             // Lowest 8 bits of EBX
-    VersionInformation->MinorVersion = HIBYTE(HIDWORD(eax));    // Highest 8 bits of EAX
+    VersionInformation->MinorVersion = HIBYTE(HIWORD(eax));     // Highest 8 bits of EAX
 
     VersionInformation->Revision = LOWORD(edx);                 // Lowest 16 bits of EDX
     VersionInformation->BuildNumber = LOWORD(eax);              // Lowest 16 bits of EAX