diff --git a/src/warden-server/bin/getClients.pl b/src/warden-server/bin/getClients.pl
index 128faa865308151aa3ad38c8310cabb9e15f678d..0f1fd3402a37b1c8a27f1dc2858eda8941d154b4 100755
--- a/src/warden-server/bin/getClients.pl
+++ b/src/warden-server/bin/getClients.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 #
 # getClients.pl
 #
@@ -7,10 +7,13 @@
 # Use of this source is governed by a BSD-style license, see LICENSE file.
 
 use strict;
+use warnings;
+
 use Getopt::Std;
 use DBI;
 use DBD::mysql;
 use FindBin qw($RealBin $RealScript);
+FindBin::again();
 use lib "$RealBin/../lib";
 use WardenCommon;
 
diff --git a/src/warden-server/bin/getStatus.pl b/src/warden-server/bin/getStatus.pl
index ccfa77ec7da016f6d00223e8848e3e3d1952b827..51fa296cf086547b728123652912b5c617a5fd2d 100755
--- a/src/warden-server/bin/getStatus.pl
+++ b/src/warden-server/bin/getStatus.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 #
 # getStatus.pl
 #
@@ -7,11 +7,14 @@
 # Use of this source is governed by a BSD-style license, see LICENSE file.
 
 use strict;
+use warnings;
+
 use Getopt::Std;
 use DBI;
 use DBD::mysql;
 use Format::Human::Bytes;
 use FindBin qw($RealBin $RealScript);
+FindBin::again();
 use lib "$RealBin/../lib";
 use WardenCommon;
 
diff --git a/src/warden-server/bin/registerReceiver.pl b/src/warden-server/bin/registerReceiver.pl
index 59f84a53e49e8819d653b56f7745895e4331ec91..e82a6519c61b188f625b25f4d9f0bdfe0ed653ce 100755
--- a/src/warden-server/bin/registerReceiver.pl
+++ b/src/warden-server/bin/registerReceiver.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 #
 # registerReceiver.pl
 #
@@ -7,6 +7,8 @@
 # Use of this source is governed by a BSD-style license, see LICENSE file.
 
 use strict;
+use warnings;
+
 use Getopt::Std;
 use Switch;
 use DBI;
@@ -16,6 +18,7 @@ use Sys::Syslog qw(:DEFAULT setlogsock);
 Sys::Syslog::setlogsock('unix');
 use Carp;
 use FindBin qw($RealBin $RealScript);
+FindBin::again();
 use lib "$RealBin/../lib";
 use WardenCommon;
 
diff --git a/src/warden-server/bin/registerSender.pl b/src/warden-server/bin/registerSender.pl
index 5146775cfe6de43c87f04774e59016b13d231ef5..f75c906ad5e80f532379de6ef882e82007558d9e 100755
--- a/src/warden-server/bin/registerSender.pl
+++ b/src/warden-server/bin/registerSender.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 #
 # registerSender.pl
 #
@@ -7,6 +7,8 @@
 # Use of this source is governed by a BSD-style license, see LICENSE file.
 
 use strict;
+use warnings;
+
 use Getopt::Std;
 use Switch;
 use DBI;
@@ -16,6 +18,7 @@ use Sys::Syslog qw(:DEFAULT setlogsock);
 Sys::Syslog::setlogsock('unix');
 use Carp;
 use FindBin qw($RealBin $RealScript);
+FindBin::again();
 use lib "$RealBin/../lib";
 use WardenCommon;
 
diff --git a/src/warden-server/bin/unregisterClient.pl b/src/warden-server/bin/unregisterClient.pl
index a17f86abf1a68efb847dd580bf21fda259e735c3..83b969d53c17bd37d22f247cf9b28b644b41b683 100755
--- a/src/warden-server/bin/unregisterClient.pl
+++ b/src/warden-server/bin/unregisterClient.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 #
 # unregisterClient.pl
 #
@@ -7,6 +7,8 @@
 # Use of this source is governed by a BSD-style license, see LICENSE file.
 
 use strict;
+use warnings;
+
 use Getopt::Std;
 use Switch;
 use DBI;
@@ -16,6 +18,7 @@ use Sys::Syslog qw(:DEFAULT setlogsock);
 Sys::Syslog::setlogsock('unix');
 use Carp;
 use FindBin qw($RealBin $RealScript);
+FindBin::again();
 use lib "$RealBin/../lib";
 use WardenCommon;