diff --git a/wrapper/Ada/spark_sockets.adb b/wrapper/Ada/spark_sockets.adb
index 2edd8d08b..a662a010d 100644
--- a/wrapper/Ada/spark_sockets.adb
+++ b/wrapper/Ada/spark_sockets.adb
@@ -43,7 +43,7 @@ package body SPARK_Sockets is
       GNAT.Sockets.Create_Socket (S, Family, Mode);
       Socket := (Exists => True, Socket => S);
    exception
-      when E : others =>
+      when others =>
          Socket := (Exists => False);
    end Create_Socket;
 
diff --git a/wrapper/Ada/tls_client.adb b/wrapper/Ada/tls_client.adb
index 60b612d2a..807b355ad 100644
--- a/wrapper/Ada/tls_client.adb
+++ b/wrapper/Ada/tls_client.adb
@@ -271,7 +271,6 @@ package body Tls_Client with SPARK_Mode is
       end if;
 
       if DTLS then
-      --  Set DTLS peer.
          Result := WolfSSL.DTLS_Set_Peer(Ssl     => Ssl,
                                          Address => A);
          if Result /= Success then
diff --git a/wrapper/Ada/tls_server.adb b/wrapper/Ada/tls_server.adb
index 7a08b1b4f..09778c5d8 100644
--- a/wrapper/Ada/tls_server.adb
+++ b/wrapper/Ada/tls_server.adb
@@ -347,11 +347,7 @@ package body Tls_Server with SPARK_Mode is
 
             Result := WolfSSL.Shutdown (Ssl);
 
-            if DTLS then
-               exit;
-            end if;
-
-            exit when Result = Success;
+            exit when DTLS or Result = Success;
             delay 0.001;  --  Delay is expressed in seconds.
 
          end loop;