diff --git a/lib/Crypt/PWSafe3.pm b/lib/Crypt/PWSafe3.pm
index 570a821..8edee12 100644
--- a/lib/Crypt/PWSafe3.pm
+++ b/lib/Crypt/PWSafe3.pm
@@ -15,7 +15,7 @@ use Digest::HMAC;
 use Digest::SHA;
 use Crypt::Random qw( makerandom );
 use Data::UUID;
-use Shell qw(mv cp);
+use File::Copy qw(cp);
 use File::Spec;
 use FileHandle;
 use Data::Dumper;
diff --git a/t/run.t b/t/run.t
index c59b340..2fd4079 100644
--- a/t/run.t
+++ b/t/run.t
@@ -1,4 +1,5 @@
-# -*-perl-*-
+#!perl -T
+#
 # testscript for Crypt::PWSafe3 Classes by Thomas Linden
 #
 # needs to be invoked using the command "make test" from