diff --git a/Code/Framework/AzNetworking/AzNetworking/DataStructures/FixedSizeBitset.h b/Code/Framework/AzNetworking/AzNetworking/DataStructures/FixedSizeBitset.h
index a91f42b3a0..3d064b5ecc 100644
--- a/Code/Framework/AzNetworking/AzNetworking/DataStructures/FixedSizeBitset.h
+++ b/Code/Framework/AzNetworking/AzNetworking/DataStructures/FixedSizeBitset.h
@@ -115,7 +115,7 @@ namespace AzNetworking
 
         ContainerType m_container;
 
-        template <AZStd::size_t, typename ElementType>
+        template <AZStd::size_t, typename>
         friend class FixedSizeVectorBitset;
     };
 }
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Builders/ResourcePool/ResourcePoolBuilder.cpp b/Gems/Atom/RPI/Code/Source/RPI.Builders/ResourcePool/ResourcePoolBuilder.cpp
index 7f617f4c6c..92c30c28b1 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Builders/ResourcePool/ResourcePoolBuilder.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Builders/ResourcePool/ResourcePoolBuilder.cpp
@@ -45,7 +45,7 @@ namespace AZ
             AssetBuilderSDK::AssetBuilderDesc builderDescriptor;
 
             builderDescriptor.m_name = "Atom Resource Pool Asset Builder";
-            builderDescriptor.m_version = 1;
+            builderDescriptor.m_version = 2; //ATOM-15196 
             builderDescriptor.m_patterns.emplace_back(AssetBuilderSDK::AssetBuilderPattern(AZStd::string("*.") + s_sourcePoolAssetExt,
                 AssetBuilderSDK::AssetBuilderPattern::PatternType::Wildcard));
             builderDescriptor.m_busId = azrtti_typeid<ResourcePoolBuilder>();
diff --git a/Gems/Multiplayer/Code/Tests/MultiplayerSystemTests.cpp b/Gems/Multiplayer/Code/Tests/MultiplayerSystemTests.cpp
index 13adc6d774..c18c2ee5e3 100644
--- a/Gems/Multiplayer/Code/Tests/MultiplayerSystemTests.cpp
+++ b/Gems/Multiplayer/Code/Tests/MultiplayerSystemTests.cpp
@@ -97,6 +97,10 @@ namespace UnitTest
         m_mpComponent->OnConnect(&connMock2);
 
         EXPECT_EQ(m_connectionAcquiredCount, 25);
+
+        // Clean up connection data
+        m_mpComponent->OnDisconnect(&connMock1, AzNetworking::DisconnectReason::None, AzNetworking::TerminationEndpoint::Local);
+        m_mpComponent->OnDisconnect(&connMock2, AzNetworking::DisconnectReason::None, AzNetworking::TerminationEndpoint::Local);
     }
 }