diff --git a/exports/delete_exports.cgi b/exports/delete_exports.cgi
index d1bea4923..ed76ac138 100755
--- a/exports/delete_exports.cgi
+++ b/exports/delete_exports.cgi
@@ -1,25 +1,29 @@
 #!/usr/local/bin/perl
 # Delete, disable or enable all exports for some directories
 
+use strict;
+use warnings;
 require './exports-lib.pl';
+our (%text, %in, %config);
 
 # Validate inputs
 &error_setup($text{'delete_err'});
 &ReadParse();
-@d = split(/\0/, $in{'d'});
+my @d = split(/\0/, $in{'d'});
 @d || &error($text{'delete_enone'});
 
 # Find the actual clients
 &lock_file($config{'exports_file'});
-@exps = &list_exports();
-foreach $e (@exps) {
+my @exps = &list_exports();
+my @dels;
+foreach my $e (@exps) {
 	if (&indexof($e->{'dir'}, @d) >= 0) {
 		push(@dels, $e);
 		}
 	}
 
 # Take them out, one by one
-foreach $d (reverse(@dels)) {
+foreach my $d (reverse(@dels)) {
 	if ($in{'delete'}) {
 		&delete_export($d);
 		}
diff --git a/exports/restart_mountd.cgi b/exports/restart_mountd.cgi
index a16e1c9d7..64a0be537 100755
--- a/exports/restart_mountd.cgi
+++ b/exports/restart_mountd.cgi
@@ -2,9 +2,12 @@
 # restart_mountd.cgi
 # Do whatever is needed to apply changes to the exports file
 
+use strict;
+use warnings;
 require './exports-lib.pl';
+our (%text);    
 &error_setup($text{'restart_err'});
-$err = &restart_mountd();
+my $err = &restart_mountd();
 &error($err) if ($err);
 &webmin_log('apply');
 &redirect("");