diff --git a/Facepunch.Steamworks.Test/bin/Debug/Facepunch.Steamworks.xml b/Facepunch.Steamworks.Test/bin/Debug/Facepunch.Steamworks.xml
index 739d822..aaf5a28 100644
--- a/Facepunch.Steamworks.Test/bin/Debug/Facepunch.Steamworks.xml
+++ b/Facepunch.Steamworks.Test/bin/Debug/Facepunch.Steamworks.xml
@@ -14,16 +14,6 @@
             Called with a message from Steam
             </summary>
         </member>
-        <member name="M:Facepunch.Steamworks.BaseSteamworks.AddCallback``2(System.Action{``0},System.Int32)">
-            <summary>
-            Global callback type
-            </summary>
-        </member>
-        <member name="M:Facepunch.Steamworks.BaseSteamworks.AddCallResult(Facepunch.Steamworks.Interop.CallResult)">
-            <summary>
-            Call results are results to specific actions
-            </summary>
-        </member>
         <member name="T:Facepunch.Steamworks.Inventory.Item">
             <summary>
             An item in your inventory.
@@ -341,13 +331,62 @@
             
             </summary>
         </member>
-        <member name="M:Facepunch.Steamworks.Config.ForcePlatform(SteamNative.OperatingSystem,SteamNative.Architecture)">
+        <member name="M:Facepunch.Steamworks.Config.ForcePlatform(Facepunch.Steamworks.OperatingSystem,Facepunch.Steamworks.Architecture)">
             <summary>
             You can force the platform to a particular one here.
             This is useful if you're on OSX because some versions of mono don't have a way
             to tell which platform we're running
             </summary>
         </member>
+        <member name="T:Facepunch.Steamworks.Workshop">
+            <summary>
+            Allows you to interact with Steam's UGC stuff (User Generated Content).
+            To put simply, this allows you to upload a folder of files to Steam.
+            
+            To upload a new file use CreateItem. This returns an Editor object.
+            This object is also used to edit existing items.
+            
+            To get a list of items you can call CreateQuery. From there you can download
+            an item and retrieve the folder that it's downloaded to. 
+            
+            Generally there's no need to compress and decompress your uploads, so you should
+            usually be able to use the content straight from the destination folder.
+            
+            </summary>
+        </member>
+        <member name="E:Facepunch.Steamworks.Workshop.OnFileDownloaded">
+            <summary>
+            Called when an item has been downloaded. This could have been
+            because of a call to Download or because of a subscription triggered
+            via the browser/app.
+            </summary>
+        </member>
+        <member name="E:Facepunch.Steamworks.Workshop.OnItemInstalled">
+            <summary>
+            Called when an item has been installed. This could have been
+            because of a call to Download or because of a subscription triggered
+            via the browser/app.
+            </summary>
+        </member>
+        <member name="M:Facepunch.Steamworks.Workshop.Dispose">
+            <summary>
+            You should never have to call this manually
+            </summary>
+        </member>
+        <member name="M:Facepunch.Steamworks.Workshop.CreateQuery">
+            <summary>
+            Creates a query object, which is used to get a list of items.
+            
+            This could be a list of the most popular items, or a search, 
+            or just getting a list of the items you've uploaded.
+            </summary>
+        </member>
+        <member name="M:Facepunch.Steamworks.Workshop.CreateItem(Facepunch.Steamworks.Workshop.ItemType)">
+            <summary>
+            Create a new Editor object with the intention of creating a new item.
+            Your item won't actually be created until you call Publish() on the object.
+            </summary>
+        </member>
         <member name="M:Facepunch.Steamworks.Workshop.EditItem(System.UInt64)">
             <summary>
             Returns a class representing this ItemId. We don't query
@@ -355,6 +394,24 @@
             We don't verify that this item belongs to your app.
             </summary>
         </member>
+        <member name="M:Facepunch.Steamworks.Workshop.GetItem(System.UInt64)">
+            <summary>
+            Gets an Item object for a specific item. This doesn't currently
+            query the item's name and description. It's only really useful
+            if you know an item's ID and want to download it, or check its
+            current download status.
+            </summary>
+        </member>
+        <member name="T:Facepunch.Steamworks.Workshop.Order">
+            <summary>
+            How a query should be ordered.
+            </summary>
+        </member>
+        <member name="T:Facepunch.Steamworks.Workshop.QueryType">
+            <summary>
+            The type of item you are querying for
+            </summary>
+        </member>
         <member name="F:Facepunch.Steamworks.Workshop.QueryType.Items">
             <summary>
             Both MicrotransactionItems and subscriptionItems
@@ -370,6 +427,17 @@
             normal Workshop item that can be subscribed to
             </summary>
         </member>
+        <member name="T:Facepunch.Steamworks.Workshop.ItemType">
+            <summary>
+            Used to define the item type when creating
+            </summary>
+        </member>
+        <member name="T:Facepunch.Steamworks.Workshop.UserQueryType">
+            <summary>
+            When querying a specific user's items this defines what
+            type of items you're looking for.
+            </summary>
+        </member>
         <member name="P:Facepunch.Steamworks.Workshop.Item.Url">
             <summary>
             Return a URL to view this item online
@@ -504,11 +572,6 @@
             Steam authetication statuses
             </summary>
         </member>
-        <member name="F:Facepunch.Steamworks.ServerAuth.Status.OK">
-            <summary>
-            Steam has verified the user is online, the ticket is valid and ticket has not been reused.
-            </summary>
-        </member>
         <member name="M:Facepunch.Steamworks.ServerAuth.StartSession(System.Byte[],System.UInt64)">
             <summary>
             Start authorizing a ticket. This user isn't authorized yet. Wait for a call to OnAuthChange.
diff --git a/Facepunch.Steamworks/Config.cs b/Facepunch.Steamworks/Config.cs
index e9bbfdc..282b3f3 100644
--- a/Facepunch.Steamworks/Config.cs
+++ b/Facepunch.Steamworks/Config.cs
@@ -24,7 +24,7 @@ public static class Config
         /// This is useful if you're on OSX because some versions of mono don't have a way
         /// to tell which platform we're running
         /// </summary>
-        public static void ForcePlatform( SteamNative.OperatingSystem os, SteamNative.Architecture arch )
+        public static void ForcePlatform( Facepunch.Steamworks.OperatingSystem os, Facepunch.Steamworks.Architecture arch )
         {
             SteamNative.Platform.Os = os;
             SteamNative.Platform.Arch = arch;
diff --git a/Facepunch.Steamworks/Facepunch.Steamworks.csproj b/Facepunch.Steamworks/Facepunch.Steamworks.csproj
index 5806b7f..4e68b3f 100644
--- a/Facepunch.Steamworks/Facepunch.Steamworks.csproj
+++ b/Facepunch.Steamworks/Facepunch.Steamworks.csproj
@@ -22,6 +22,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DocumentationFile>..\..\..\Work\Rust\Main\Assets\Plugins\Facepunch.Steamworks\Facepunch.Steamworks.XML</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
diff --git a/Facepunch.Steamworks/Interfaces/Workshop.cs b/Facepunch.Steamworks/Interfaces/Workshop.cs
index 64ff878..9fe513f 100644
--- a/Facepunch.Steamworks/Interfaces/Workshop.cs
+++ b/Facepunch.Steamworks/Interfaces/Workshop.cs
@@ -4,6 +4,20 @@
 
 namespace Facepunch.Steamworks
 {
+    /// <summary>
+    /// Allows you to interact with Steam's UGC stuff (User Generated Content).
+    /// To put simply, this allows you to upload a folder of files to Steam.
+    /// 
+    /// To upload a new file use CreateItem. This returns an Editor object.
+    /// This object is also used to edit existing items.
+    /// 
+    /// To get a list of items you can call CreateQuery. From there you can download
+    /// an item and retrieve the folder that it's downloaded to. 
+    /// 
+    /// Generally there's no need to compress and decompress your uploads, so you should
+    /// usually be able to use the content straight from the destination folder.
+    /// 
+    /// </summary>
     public partial class Workshop : IDisposable
     {
         internal const ulong InvalidHandle = 0xffffffffffffffff;
@@ -13,7 +27,18 @@ public partial class Workshop : IDisposable
         internal BaseSteamworks steamworks;
         internal SteamNative.SteamRemoteStorage remoteStorage;
 
-        internal event Action<ulong, Callbacks.Result> OnFileDownloaded;
+        /// <summary>
+        /// Called when an item has been downloaded. This could have been
+        /// because of a call to Download or because of a subscription triggered
+        /// via the browser/app.
+        /// </summary>
+        public event Action<ulong, Callbacks.Result> OnFileDownloaded;
+
+        /// <summary>
+        /// Called when an item has been installed. This could have been
+        /// because of a call to Download or because of a subscription triggered
+        /// via the browser/app.
+        /// </summary>
         internal event Action<ulong> OnItemInstalled;
 
         internal Workshop( BaseSteamworks steamworks, SteamNative.SteamUGC ugc, SteamNative.SteamRemoteStorage remoteStorage )
@@ -29,6 +54,9 @@ internal Workshop( BaseSteamworks steamworks, SteamNative.SteamUGC ugc, SteamNat
             // steamworks.AddCallback<ItemInstalled, ItemInstalled.Small>( onItemInstalled, ItemInstalled.CallbackId );
         }
 
+        /// <summary>
+        /// You should never have to call this manually
+        /// </summary>
         public void Dispose()
         {
             ugc = null;
@@ -52,6 +80,12 @@ private void onDownloadResult( SteamNative.DownloadItemResult_t obj, bool failed
                 OnFileDownloaded( obj.PublishedFileId, (Callbacks.Result) obj.Result );
         }
 
+        /// <summary>
+        /// Creates a query object, which is used to get a list of items.
+        /// 
+        /// This could be a list of the most popular items, or a search, 
+        /// or just getting a list of the items you've uploaded.
+        /// </summary>
         public Query CreateQuery()
         {
             return new Query()
@@ -62,6 +96,10 @@ public Query CreateQuery()
             };
         }
 
+        /// <summary>
+        /// Create a new Editor object with the intention of creating a new item.
+        /// Your item won't actually be created until you call Publish() on the object.
+        /// </summary>
         public Editor CreateItem( ItemType type )
         {
             return new Editor() { workshop = this, Type = type };
@@ -77,11 +115,21 @@ public Editor EditItem( ulong itemId )
             return new Editor() { workshop = this, Id = itemId };
         }
 
+        /// <summary>
+        /// Gets an Item object for a specific item. This doesn't currently
+        /// query the item's name and description. It's only really useful
+        /// if you know an item's ID and want to download it, or check its
+        /// current download status.
+        /// </summary>
         public Item GetItem( ulong itemid )
         {
             return new Item( itemid, this );
         }
 
+
+        /// <summary>
+        /// How a query should be ordered.
+        /// </summary>
         public enum Order
         {
             RankedByVote = 0,
@@ -99,6 +147,9 @@ public enum Order
             RankedByTotalUniqueSubscriptions = 12,
         };
 
+        /// <summary>
+        /// The type of item you are querying for
+        /// </summary>
         public enum QueryType
         {
             /// <summary>
@@ -125,6 +176,9 @@ public enum QueryType
             GameManagedItems = 12,        // game managed items (not managed by users)
         };
 
+        /// <summary>
+        /// Used to define the item type when creating
+        /// </summary>
         public enum ItemType
         {
             Community = 0,       // normal Workshop item that can be subscribed to
@@ -145,6 +199,10 @@ public enum ItemType
             GameManagedItem = 15,        // managed completely by the game, not the user, and not shown on the web
         };
 
+        /// <summary>
+        /// When querying a specific user's items this defines what
+        /// type of items you're looking for.
+        /// </summary>
         public enum UserQueryType : uint
         {
             Published = 0,
diff --git a/Facepunch.Steamworks/SteamNative/SteamNative.Callback.cs b/Facepunch.Steamworks/SteamNative/SteamNative.Callback.cs
index 29d7684..feb05b8 100644
--- a/Facepunch.Steamworks/SteamNative/SteamNative.Callback.cs
+++ b/Facepunch.Steamworks/SteamNative/SteamNative.Callback.cs
@@ -37,7 +37,7 @@ public class VTable
     //
     // Created on registration of a callback
     //
-    public class CallbackHandle : IDisposable
+    internal class CallbackHandle : IDisposable
     {
         internal BaseSteamworks steamworks;
         internal SteamAPICall_t CallResultHandle;
diff --git a/Facepunch.Steamworks/SteamNative/SteamNative.Platform.cs b/Facepunch.Steamworks/SteamNative/SteamNative.Platform.cs
index 91709e3..f57b275 100644
--- a/Facepunch.Steamworks/SteamNative/SteamNative.Platform.cs
+++ b/Facepunch.Steamworks/SteamNative/SteamNative.Platform.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace SteamNative
+namespace Facepunch.Steamworks
 {
     public enum OperatingSystem
     {
@@ -17,34 +17,37 @@ public enum Architecture
         x86,
         x64
     }
+}
 
+namespace SteamNative
+{
     internal static partial class Platform
     {
-        private static OperatingSystem _os;
-        private static Architecture _arch;
+        private static Facepunch.Steamworks.OperatingSystem _os;
+        private static Facepunch.Steamworks.Architecture _arch;
 
-        internal static OperatingSystem Os
+        internal static Facepunch.Steamworks.OperatingSystem Os
         {
             get
             {
                 //
                 // Work out our platform
                 //
-                if ( _os == OperatingSystem.Unset )
+                if ( _os == Facepunch.Steamworks.OperatingSystem.Unset )
                 {
-                    _os = OperatingSystem.Windows;
+                    _os = Facepunch.Steamworks.OperatingSystem.Windows;
 
                     //
                     // These checks aren't so accurate on older versions of mono
                     //
-                    if ( Environment.OSVersion.Platform == PlatformID.MacOSX ) _os = OperatingSystem.Osx;
-                    if ( Environment.OSVersion.Platform == PlatformID.Unix ) _os = OperatingSystem.Linux;
+                    if ( Environment.OSVersion.Platform == PlatformID.MacOSX ) _os = Facepunch.Steamworks.OperatingSystem.Osx;
+                    if ( Environment.OSVersion.Platform == PlatformID.Unix ) _os = Facepunch.Steamworks.OperatingSystem.Linux;
 
                     //
                     // Edging our bets
                     //
-                    if ( Environment.OSVersion.VersionString.ToLower().Contains( "unix" ) ) _os = OperatingSystem.Linux;
-                    if ( Environment.OSVersion.VersionString.ToLower().Contains( "osx" ) ) _os = OperatingSystem.Osx;
+                    if ( Environment.OSVersion.VersionString.ToLower().Contains( "unix" ) ) _os = Facepunch.Steamworks.OperatingSystem.Linux;
+                    if ( Environment.OSVersion.VersionString.ToLower().Contains( "osx" ) ) _os = Facepunch.Steamworks.OperatingSystem.Osx;
                 }
 
                 return _os;
@@ -56,19 +59,19 @@ internal static OperatingSystem Os
             }
         }
 
-        internal static Architecture Arch
+        internal static Facepunch.Steamworks.Architecture Arch
         {
             get
             {
                 //
                 // Work out whether we're 64bit or 32bit
                 //
-                if ( _arch == Architecture.Unset )
+                if ( _arch == Facepunch.Steamworks.Architecture.Unset )
                 {
                     if ( IntPtr.Size == 8 )
-                        _arch = Architecture.x64;
+                        _arch = Facepunch.Steamworks.Architecture.x64;
                     else if ( IntPtr.Size == 4 )
-                        _arch = Architecture.x86;
+                        _arch = Facepunch.Steamworks.Architecture.x86;
                     else
                         throw new System.Exception( "Unsupported Architecture!" );
                 }
@@ -82,16 +85,17 @@ internal static Architecture Arch
             }
         }
 
-        public static bool IsWindows64 { get { return Arch == Architecture.x64 && Os == OperatingSystem.Windows; } }
-        public static bool IsWindows32 { get { return Arch == Architecture.x86 && Os == OperatingSystem.Windows; } }
-        public static bool IsLinux64 { get { return Arch == Architecture.x64 && Os == OperatingSystem.Linux; } }
-        public static bool IsLinux32 { get { return Arch == Architecture.x86 && Os == OperatingSystem.Linux; } }
-        public static bool IsOsx { get { return Os == OperatingSystem.Osx; } }
+        public static bool IsWindows { get { return Os == Facepunch.Steamworks.OperatingSystem.Windows; } }
+        public static bool IsWindows64 { get { return Arch == Facepunch.Steamworks.Architecture.x64 && IsWindows; } }
+        public static bool IsWindows32 { get { return Arch == Facepunch.Steamworks.Architecture.x86 && IsWindows; } }
+        public static bool IsLinux64 { get { return Arch == Facepunch.Steamworks.Architecture.x64 && Os == Facepunch.Steamworks.OperatingSystem.Linux; } }
+        public static bool IsLinux32 { get { return Arch == Facepunch.Steamworks.Architecture.x86 && Os == Facepunch.Steamworks.OperatingSystem.Linux; } }
+        public static bool IsOsx { get { return Os == Facepunch.Steamworks.OperatingSystem.Osx; } }
 
 
         /// <summary>
         /// We're only Pack = 8 on Windows
         /// </summary>
-        public static bool PackSmall { get { return Os != OperatingSystem.Windows; } }
+        public static bool PackSmall { get { return Os != Facepunch.Steamworks.OperatingSystem.Windows; } }
     }
 }
diff --git a/Facepunch.Steamworks/SteamNative/SteamNative.Structs.cs b/Facepunch.Steamworks/SteamNative/SteamNative.Structs.cs
index de6f772..b8d0141 100644
--- a/Facepunch.Steamworks/SteamNative/SteamNative.Structs.cs
+++ b/Facepunch.Steamworks/SteamNative/SteamNative.Structs.cs
@@ -121,7 +121,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -222,7 +222,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -335,7 +335,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -442,7 +442,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -549,7 +549,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -660,7 +660,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -764,7 +764,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -867,7 +867,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -980,7 +980,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -1163,7 +1163,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -1264,7 +1264,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -1372,7 +1372,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -1476,7 +1476,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -1586,7 +1586,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -1703,7 +1703,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -1807,7 +1807,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -1913,7 +1913,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -2020,7 +2020,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -2124,7 +2124,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -2238,7 +2238,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -2341,7 +2341,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -2455,7 +2455,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -2559,7 +2559,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -2676,7 +2676,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -2795,7 +2795,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -2917,7 +2917,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -3038,7 +3038,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -3139,7 +3139,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -3246,7 +3246,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -3357,7 +3357,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -3463,7 +3463,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -3762,7 +3762,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -3869,7 +3869,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -3991,7 +3991,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -4098,7 +4098,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -4208,7 +4208,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -4318,7 +4318,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -4428,7 +4428,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -4539,7 +4539,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -4646,7 +4646,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -4760,7 +4760,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -4866,7 +4866,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -4967,7 +4967,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -5109,7 +5109,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -5216,7 +5216,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -5333,7 +5333,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -5437,7 +5437,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -5556,7 +5556,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -5665,7 +5665,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -5779,7 +5779,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -5901,7 +5901,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -6015,7 +6015,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -6142,7 +6142,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -6256,7 +6256,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -6375,7 +6375,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -6503,7 +6503,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -6690,7 +6690,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -6823,7 +6823,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -6949,7 +6949,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -7053,7 +7053,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -7157,7 +7157,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -7261,7 +7261,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -7375,7 +7375,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -7482,7 +7482,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -7594,7 +7594,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -7711,7 +7711,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -7841,7 +7841,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -7957,7 +7957,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -8064,7 +8064,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -8175,7 +8175,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -8295,7 +8295,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -8456,7 +8456,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -8560,7 +8560,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -8677,7 +8677,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -8791,7 +8791,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -8908,7 +8908,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -9034,7 +9034,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -9148,7 +9148,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -9249,7 +9249,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -9363,7 +9363,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -9477,7 +9477,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -9591,7 +9591,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -9698,7 +9698,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -9812,7 +9812,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -9913,7 +9913,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -10017,7 +10017,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -10129,7 +10129,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -10251,7 +10251,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -10405,7 +10405,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -10509,7 +10509,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -10619,7 +10619,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -10723,7 +10723,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -10824,7 +10824,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -10927,7 +10927,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -11030,7 +11030,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -11131,7 +11131,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -11232,7 +11232,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -11333,7 +11333,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -11434,7 +11434,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -11549,7 +11549,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -11653,7 +11653,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -11763,7 +11763,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -11873,7 +11873,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -12262,7 +12262,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -12368,7 +12368,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -12487,7 +12487,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -12603,7 +12603,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -12710,7 +12710,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -12829,7 +12829,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -12948,7 +12948,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -13077,7 +13077,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -13188,7 +13188,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -13299,7 +13299,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -13400,7 +13400,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -13501,7 +13501,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -13612,7 +13612,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -13875,7 +13875,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -13982,7 +13982,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -14086,7 +14086,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -14190,7 +14190,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -14297,7 +14297,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -14408,7 +14408,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -14526,7 +14526,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -14644,7 +14644,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -14764,7 +14764,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -14868,7 +14868,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -14972,7 +14972,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -15079,7 +15079,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -15198,7 +15198,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -15302,7 +15302,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -15406,7 +15406,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -15510,7 +15510,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -15614,7 +15614,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -15715,7 +15715,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -15860,7 +15860,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -15961,7 +15961,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -16062,7 +16062,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -16171,7 +16171,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -16275,7 +16275,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -16384,7 +16384,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -16488,7 +16488,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -16599,7 +16599,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -16700,7 +16700,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -16810,7 +16810,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -16924,7 +16924,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -17055,7 +17055,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -17166,7 +17166,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -17289,7 +17289,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -17403,7 +17403,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -17517,7 +17517,7 @@ public static CallbackHandle CallResult( Facepunch.Steamworks.BaseSteamworks ste
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -17618,7 +17618,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
@@ -17722,7 +17722,7 @@ public static void RegisterCallback( Facepunch.Steamworks.BaseSteamworks steamwo
 			//
 			// The order of these functions are swapped on Windows
 			//
-			if ( Platform.Os == OperatingSystem.Windows )
+			if ( Platform.IsWindows )
 			{
 				vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );
 				vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );
diff --git a/Generator/CodeWriter/Struct.cs b/Generator/CodeWriter/Struct.cs
index ea531ab..44268b7 100644
--- a/Generator/CodeWriter/Struct.cs
+++ b/Generator/CodeWriter/Struct.cs
@@ -301,7 +301,7 @@ private void CallbackCallresultShared( SteamApiDefinition.StructDef c, bool Resu
             WriteLine( "//" );
             WriteLine( "// The order of these functions are swapped on Windows" );
             WriteLine( "//" );
-            StartBlock( "if ( Platform.Os == OperatingSystem.Windows )" );
+            StartBlock( "if ( Platform.IsWindows )" );
             {
                 WriteLine( "vTable.ResultA = Marshal.GetFunctionPointerForDelegate( funcB );" );
                 WriteLine( "vTable.ResultB = Marshal.GetFunctionPointerForDelegate( funcA );" );