diff --git a/pontarius-xmpp.cabal b/pontarius-xmpp.cabal
--- a/pontarius-xmpp.cabal
+++ b/pontarius-xmpp.cabal
@@ -1,6 +1,6 @@
 Cabal-Version: 2.2
 Name:          pontarius-xmpp
-Version:       0.5.7.0
+Version:       0.5.7.1
 Build-Type:    Simple
 License:       BSD-3-Clause
 License-File:  LICENSE.md
@@ -17,7 +17,7 @@
                While in alpha, Pontarius XMPP works quite well and fulfills most
                requirements of the RFCs.
 Category:      Network
-Tested-With:   GHC == 9.8.2
+Tested-With:   GHC == 9.8.3
 
 Extra-Source-Files: README.md
                   , ChangeLog.md
@@ -69,11 +69,7 @@
                , xml-conduit          >=1.1.0.7
                , xml-picklers         >=0.3.3
                , xml-types            >=0.3.1
-  If impl(ghc ==7.0.1) {
-    Build-Depends: bytestring         >=0.9.1.9 && <=0.9.2.1
-  } Else {
-    Build-Depends: bytestring         >=0.9.1.9
-  }
+               , bytestring           >=0.9.1.9
   If flag(with-th) && impl(ghc >=7.6.1) {
     Build-Depends: template-haskell >=2.5
   }
@@ -214,4 +210,4 @@
 Source-Repository this
   Type: git
   Location: https://github.com/l29ah/pontarius-xmpp.git
-  Tag: 0.5.7.0
+  Tag: 0.5.7.1
diff --git a/source/Network/Xmpp/Lens.hs b/source/Network/Xmpp/Lens.hs
--- a/source/Network/Xmpp/Lens.hs
+++ b/source/Network/Xmpp/Lens.hs
@@ -515,25 +515,24 @@
 -----------------
 
 clientServerIdentificationL  :: Lens ClientParams (String, BS.ByteString)
-clientServerIdentificationL inj cp@ClientParams{clientServerIdentification = x}
-    = (\x' -> cp{clientServerIdentification = x'}) <$> inj x
+clientServerIdentificationL inj cp
+    = (\x' -> cp{clientServerIdentification = x'}) <$> inj (clientServerIdentification cp)
 
 clientSupportedL  :: Lens ClientParams Supported
-clientSupportedL inj cp@ClientParams{clientSupported = x}
-    = (\x' -> cp{clientSupported = x'}) <$> inj x
+clientSupportedL inj cp
+    = (\x' -> cp{clientSupported = x'}) <$> inj (clientSupported cp)
 
 clientUseServerNameIndicationL  :: Lens ClientParams Bool
-clientUseServerNameIndicationL inj
-    cp@ClientParams{clientUseServerNameIndication = x}
-    = (\x' -> cp{clientUseServerNameIndication = x'}) <$> inj x
+clientUseServerNameIndicationL inj cp
+    = (\x' -> cp{clientUseServerNameIndication = x'}) <$> inj (clientUseServerNameIndication cp)
 
 supportedCiphersL :: Lens Supported [Cipher]
-supportedCiphersL inj s@Supported{supportedCiphers = x}
-    = (\x' -> s{supportedCiphers = x'}) <$> inj x
+supportedCiphersL inj s
+    = (\x' -> s{supportedCiphers = x'}) <$> inj (supportedCiphers s)
 
 supportedVersionsL :: Lens Supported [TLS.Version]
-supportedVersionsL inj s@Supported{supportedVersions = x}
-    = (\x' -> s{supportedVersions = x'}) <$> inj x
+supportedVersionsL inj s
+    = (\x' -> s{supportedVersions = x'}) <$> inj (supportedVersions s)
 
 -- SessionConfiguration
 -----------------------
diff --git a/tests/Tests/Stream.hs b/tests/Tests/Stream.hs
--- a/tests/Tests/Stream.hs
+++ b/tests/Tests/Stream.hs
@@ -10,7 +10,6 @@
 import           Test.Hspec
 import           Test.Tasty
 import           Test.Tasty.HUnit
-import           Test.Tasty.Hspec
 import           Test.Tasty.TH
 
 import           Network.Xmpp.Internal