diff --git a/Havit.Blazor.Components.Web/Messenger/MessengerServiceCollectionExtensions.cs b/Havit.Blazor.Components.Web/Messenger/MessengerServiceCollectionExtensions.cs
index cbc3437b..9f531c52 100644
--- a/Havit.Blazor.Components.Web/Messenger/MessengerServiceCollectionExtensions.cs
+++ b/Havit.Blazor.Components.Web/Messenger/MessengerServiceCollectionExtensions.cs
@@ -13,7 +13,7 @@ public static class MessengerServiceCollectionExtensions
 	/// </summary>
 	public static IServiceCollection AddHxMessenger(this IServiceCollection services)
 	{
-		if (RuntimeInformation.IsOSPlatform(OSPlatform.Create("BROWSER")))
+		if (OperatingSystem.IsBrowser())
 		{
 			// Allows gRPC Interceptors and HttpMessageHandlers to pass error messages to the HxMessenger without having to struggle with different DI Scope
 			return services.AddSingleton<IHxMessengerService, HxMessengerService>();
diff --git a/Havit.Blazor.Documentation/XmlDoc/Havit.Blazor.GoogleTagManager.xml b/Havit.Blazor.Documentation/XmlDoc/Havit.Blazor.GoogleTagManager.xml
index cc3e6906..faccdc7a 100644
--- a/Havit.Blazor.Documentation/XmlDoc/Havit.Blazor.GoogleTagManager.xml
+++ b/Havit.Blazor.Documentation/XmlDoc/Havit.Blazor.GoogleTagManager.xml
@@ -6,7 +6,7 @@
     <members>
         <member name="M:Havit.Blazor.GoogleTagManager.GoogleTagManagerServiceCollectionExtensions.AddHxGoogleTagManager(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action{Havit.Blazor.GoogleTagManager.HxGoogleTagManagerOptions})">
             <summary>
-            Adds Google Tag Mananger (GTM) support. Use <see cref="T:Havit.Blazor.GoogleTagManager.IHxGoogleTagManager"/> to push data to <c>dataLayer</c> and/or <see cref="T:Havit.Blazor.GoogleTagManager.HxGoogleTagManagerPageViewTracker"/> to track page-views.
+            Adds Google Tag Manager (GTM) support. Use <see cref="T:Havit.Blazor.GoogleTagManager.IHxGoogleTagManager"/> to push data to <c>dataLayer</c> and/or <see cref="T:Havit.Blazor.GoogleTagManager.HxGoogleTagManagerPageViewTracker"/> to track page-views.
             </summary>
             <param name="services"></param>
             <param name="configureOptions"></param>
diff --git a/Havit.Blazor.GoogleTagManager/GoogleTagManagerServiceCollectionExtensions.cs b/Havit.Blazor.GoogleTagManager/GoogleTagManagerServiceCollectionExtensions.cs
index 1ef14483..71d849da 100644
--- a/Havit.Blazor.GoogleTagManager/GoogleTagManagerServiceCollectionExtensions.cs
+++ b/Havit.Blazor.GoogleTagManager/GoogleTagManagerServiceCollectionExtensions.cs
@@ -6,14 +6,14 @@ namespace Havit.Blazor.GoogleTagManager;
 public static class GoogleTagManagerServiceCollectionExtensions
 {
 	/// <summary>
-	/// Adds Google Tag Mananger (GTM) support. Use <see cref="IHxGoogleTagManager"/> to push data to <c>dataLayer</c> and/or <see cref="HxGoogleTagManagerPageViewTracker"/> to track page-views.
+	/// Adds Google Tag Manager (GTM) support. Use <see cref="IHxGoogleTagManager"/> to push data to <c>dataLayer</c> and/or <see cref="HxGoogleTagManagerPageViewTracker"/> to track page-views.
 	/// </summary>
 	/// <param name="services"></param>
 	/// <param name="configureOptions"></param>
 	/// <returns></returns>
 	public static IServiceCollection AddHxGoogleTagManager(this IServiceCollection services, Action<HxGoogleTagManagerOptions> configureOptions)
 	{
-		if (RuntimeInformation.IsOSPlatform(OSPlatform.Create("browser")))
+		if (OperatingSystem.IsBrowser())
 		{
 			services.AddSingleton<IHxGoogleTagManager, HxGoogleTagManager>();
 		}