diff --git a/build-constraints.yaml b/build-constraints.yaml
index e63611a4..2f70d5d9 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3169,6 +3169,7 @@ packages:
         # https://github.com/fpco/stackage/issues/2334
         - tcp-streams < 1.0.0.0
         - tcp-streams-openssl < 1.0.0.0
+        - mysql-haskell < 0.8.1.0
 
         # https://github.com/fpco/stackage/issues/2345
         - syb < 0.7
@@ -3188,23 +3189,18 @@ packages:
         # https://github.com/fpco/stackage/issues/2451
         - websockets < 0.11.0.0
         - servant-subscriber < 0.6.0.1
+        - websockets-simple < 0.0.2.1
+        - websockets-rpc < 0.4.1
 
         # https://github.com/fpco/stackage/issues/2487
         - graphviz < 2999.19
 
-        # https://github.com/fpco/stackage/issues/2451
-        - websockets-simple < 0.0.2.1
-        - websockets-rpc < 0.4.1
-
         # https://github.com/fpco/stackage/issues/2528
         - concurrent-output < 1.10.0
 
         # https://github.com/fpco/stackage/issues/2529
         - mmorph < 1.1.0
 
-        # https://github.com/fpco/stackage/issues/2533
-        - mysql-haskell < 0.8.1.0
-
         # https://github.com/fpco/stackage/issues/2604
         - criterion < 1.2
         - statistics < 0.14
@@ -3226,7 +3222,7 @@ packages:
         # https://github.com/fpco/stackage/issues/2562
         - trifecta < 1.7
 
-        # https://github.com/haskell/haddock/issues/634
+        # https://github.com/haskell/haddock/issues/634 - causes other docs to fail to build
         - haddock < 2.17.5
 
         # https://github.com/fpco/stackage/issues/2569
@@ -3267,9 +3263,6 @@ packages:
         # https://github.com/fpco/stackage/issues/2607
         - http-media < 0.7.0
 
-        # https://github.com/fpco/stackage/issues/2612
-        - email-validate < 2.3
-
 # end of packages
 
 # Package flags are applied to individual packages, and override the values of
@@ -3517,7 +3510,6 @@ skipped-tests:
     - fgl
     - fgl-arbitrary
     - graphviz
-    - graphviz
     - wl-pprint-text
 
     # directory 1.3