diff --git a/Gems/Atom/Feature/Common/Code/Source/CoreLights/LightCullingTilePreparePass.cpp b/Gems/Atom/Feature/Common/Code/Source/CoreLights/LightCullingTilePreparePass.cpp
index c144525cec..4f2a4f0346 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/LightCullingTilePreparePass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/LightCullingTilePreparePass.cpp
@@ -176,7 +176,7 @@ namespace AZ
         {
             LoadShader();
             AZ_Assert(GetPassState() != RPI::PassState::Rendering, "LightCullingTilePreparePass: Trying to reload shader during rendering");
-            if (GetPassState() == RPI::PassState::Initialized)
+            if (GetPassState() == RPI::PassState::Idle)
             {
                 ChooseShaderVariant();
             }
diff --git a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/TaaPass.cpp b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/TaaPass.cpp
index 9f885ede70..38e03ab156 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/TaaPass.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/TaaPass.cpp
@@ -108,7 +108,7 @@ namespace AZ::Render
         Base::ResetInternal();
     }
 
-    void TaaPass::BuildAttachmentsInternal()
+    void TaaPass::BuildInternal()
     {
         m_accumulationAttachments[0] = FindAttachment(Name("Accumulation1"));
         m_accumulationAttachments[1] = FindAttachment(Name("Accumulation2"));
@@ -143,7 +143,7 @@ namespace AZ::Render
             m_outputColorBinding->SetAttachment(m_accumulationAttachments[1]);
         }
 
-        Base::BuildAttachmentsInternal();
+        Base::BuildInternal();
     }
 
     void TaaPass::UpdateAttachmentImage(RPI::Ptr<RPI::PassAttachment>& attachment)
diff --git a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/TaaPass.h b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/TaaPass.h
index 6133720691..e8f4796e7b 100644
--- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/TaaPass.h
+++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/TaaPass.h
@@ -63,7 +63,7 @@ namespace AZ::Render
         // Pass behavior overrides...
         void FrameBeginInternal(FramePrepareParams params) override;
         void ResetInternal() override;
-        void BuildAttachmentsInternal() override;
+        void BuildInternal() override;
 
         void UpdateAttachmentImage(RPI::Ptr<RPI::PassAttachment>& attachment);
 
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Pass.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Pass.cpp
index 4002216361..78e30e7176 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Pass.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/Pass.cpp
@@ -1160,8 +1160,6 @@ namespace AZ
         {
             AZ_RPI_BREAK_ON_TARGET_PASS;
 
-            AZ_Assert(m_state == PassState::Reset, "ANTON - BUILDING PASS BUT STATE IS NOT RESET!!");
-
             bool execute = (m_state == PassState::Idle || m_state == PassState::Reset);
             execute = execute || (m_state == PassState::Queued && m_queueState == PassQueueState::QueuedForBuild);
             execute = execute || (m_state == PassState::Queued && m_queueState == PassQueueState::QueuedForInitialization);
@@ -1180,6 +1178,7 @@ namespace AZ
             }
 #endif
 
+            AZ_Assert(m_state == PassState::Reset, "ANTON - BUILDING PASS BUT STATE IS NOT RESET!!");
             m_state = PassState::Building;
 
             // Bindings, inputs and attachments
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/PassSystem.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/PassSystem.cpp
index a7021ee6fd..76ea52b4a3 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/PassSystem.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/PassSystem.cpp
@@ -217,7 +217,7 @@ namespace AZ
                 Pass* previousPassInList = nullptr;
                 for (const Ptr<Pass>& pass : buildListCopy)
                 {
-                    if (pass.get() != previousPassInList);
+                    if (pass.get() != previousPassInList)
                     {
                         pass->Reset();
                         previousPassInList = pass.get();
@@ -226,7 +226,7 @@ namespace AZ
                 previousPassInList = nullptr;
                 for (const Ptr<Pass>& pass : buildListCopy)
                 {
-                    if (pass.get() != previousPassInList);
+                    if (pass.get() != previousPassInList)
                     {
                         pass->Build(true);
                         previousPassInList = pass.get();
@@ -276,7 +276,7 @@ namespace AZ
                 Pass* previousPassInList = nullptr;
                 for (const Ptr<Pass>& pass : initListCopy)
                 {
-                    if (pass.get() != previousPassInList);
+                    if (pass.get() != previousPassInList)
                     {
                         pass->Initialize();
                         previousPassInList = pass.get();