diff --git a/src/cascadia/TerminalCore/TerminalSelection.cpp b/src/cascadia/TerminalCore/TerminalSelection.cpp
index bb71a348e3f..f7c63b9cf8d 100644
--- a/src/cascadia/TerminalCore/TerminalSelection.cpp
+++ b/src/cascadia/TerminalCore/TerminalSelection.cpp
@@ -379,7 +379,7 @@ void Terminal::ExpandSelectionToWord()
         _selection->pivot = _selection->start;
         _selection->end = buffer.GetWordEnd(_selection->end, _wordDelimiters);
 
-        // if we're targetting both endpoints, instead just target "end"
+        // if we're targeting both endpoints, instead just target "end"
         if (WI_IsFlagSet(_selectionEndpoint, SelectionEndpoint::Start) && WI_IsFlagSet(_selectionEndpoint, SelectionEndpoint::End))
         {
             _selectionEndpoint = SelectionEndpoint::End;
diff --git a/src/renderer/atlas/AtlasEngine.cpp b/src/renderer/atlas/AtlasEngine.cpp
index 983b4cd082b..63d253e622a 100644
--- a/src/renderer/atlas/AtlasEngine.cpp
+++ b/src/renderer/atlas/AtlasEngine.cpp
@@ -681,11 +681,18 @@ void AtlasEngine::_createResources()
                 break;
             }
 
-            static constexpr auto flags = D3DCOMPILE_PACK_MATRIX_COLUMN_MAJOR | D3DCOMPILE_ENABLE_STRICTNESS | D3DCOMPILE_WARNINGS_ARE_ERRORS
+            static constexpr auto flags =
+                D3DCOMPILE_PACK_MATRIX_COLUMN_MAJOR
 #ifdef NDEBUG
-                                          | D3DCOMPILE_OPTIMIZATION_LEVEL3;
+                | D3DCOMPILE_OPTIMIZATION_LEVEL3;
 #else
-                                          | D3DCOMPILE_DEBUG | D3DCOMPILE_SKIP_OPTIMIZATION;
+                // Only enable strictness and warnings in DEBUG mode
+                //  as these settings makes it very difficult to develop
+                //  shaders as windows terminal is not telling the user
+                //  what's wrong, windows terminal just fails.
+                //  Keep it in DEBUG mode to catch errors in shaders
+                //  shipped with windows terminal
+                | D3DCOMPILE_ENABLE_STRICTNESS | D3DCOMPILE_WARNINGS_ARE_ERRORS | D3DCOMPILE_DEBUG | D3DCOMPILE_SKIP_OPTIMIZATION;
 #endif
 
             wil::com_ptr<ID3DBlob> error;