diff --git a/plug-ins/perl/Gimp/Lib.pm b/plug-ins/perl/Gimp/Lib.pm
index 5c69f17874..4e50d3384e 100644
--- a/plug-ins/perl/Gimp/Lib.pm
+++ b/plug-ins/perl/Gimp/Lib.pm
@@ -43,15 +43,15 @@ sub import {}
 # does not work.
 
 sub gimp_image_list {
-   map _autobless($_,&Gimp::GIMP_PDB_IMAGE),gimp_call_procedure "gimp_image_list";
+   map _autobless($_,&Gimp::PDB_IMAGE),gimp_call_procedure "gimp_image_list";
 }
 
 sub gimp_image_get_layers {
-   map _autobless($_,&Gimp::GIMP_PDB_LAYER),gimp_call_procedure "gimp_image_get_layers",@_;
+   map _autobless($_,&Gimp::PDB_LAYER),gimp_call_procedure "gimp_image_get_layers",@_;
 }
 
 sub gimp_image_get_channels {
-   map _autobless($_,&Gimp::GIMP_PDB_CHANNEL),gimp_call_procedure "gimp_image_get_channels",@_;
+   map _autobless($_,&Gimp::PDB_CHANNEL),gimp_call_procedure "gimp_image_get_channels",@_;
 }
 
 # "server-side" perl code evaluation
diff --git a/plug-ins/perl/Net/Net.pm b/plug-ins/perl/Net/Net.pm
index e28e6c1fa4..7d55f3fe5d 100644
--- a/plug-ins/perl/Net/Net.pm
+++ b/plug-ins/perl/Net/Net.pm
@@ -173,20 +173,15 @@ sub start_server {
       push(@args,"--no-data") if $opt=~s/(^|:)no-?data//;
       push(@args,"-i") unless $opt=~s/(^|:)gui//;
       push(@args,"--verbose") if $Gimp::verbose;
-         print STDERR $Gimp::Config{GIMP},
-              "--no-splash",
-              @args,
-              "-b",
-              "(extension-perl-server $args)",
-              "(gimp_quit 0)",
-              "(gimp-quit 0)";
       { # block to suppress warning with broken perls (e.g. 5.004)
          exec $Gimp::Config{GIMP},
               "--no-splash",
+              "--no-splash-image",
+              "--enable-stack-trace", "never",
+              "--console-messages",
               @args,
               "-b",
               "(extension-perl-server $args)",
-              "(gimp_quit 0)",
               "(gimp-quit 0)";
       }
       exit(255);
diff --git a/plug-ins/perl/Perl-Server b/plug-ins/perl/Perl-Server
index 05ad14f171..121dfe1d05 100755
--- a/plug-ins/perl/Perl-Server
+++ b/plug-ins/perl/Perl-Server
@@ -1,7 +1,4 @@
-#!/usr/app/bin/perl
-
-eval 'exec /usr/app/bin/perl  -S $0 ${1+"$@"}'
-    if 0; # not running under some shell
+#!/usr/bin/perl
 
 # you can enable unix sockets, tcp sockets, or both (or neither...)
 #
@@ -169,7 +166,6 @@ sub extension_perl_server {
   if ($run_mode == &Gimp::RUN_NONINTERACTIVE) {
      if ($ps_flags & &Gimp::_PS_FLAG_BATCH) {
         my($fh) = local *FH;
-        print "CSOCKET would be $extra\n";
         open $fh,"+<&$extra" or die __"unable to open Gimp::Net communications socket: $!\n";
         select $fh; $|=1; select STDOUT;
         reply $fh,"PERL-SERVER",$Gimp::_PROT_VERSION;
diff --git a/plug-ins/perl/examples/PDB b/plug-ins/perl/examples/PDB
index b8de87d4fc..350a387b6b 100755
--- a/plug-ins/perl/examples/PDB
+++ b/plug-ins/perl/examples/PDB
@@ -1,7 +1,4 @@
-#!/usr/app/bin/perl
-
-eval 'exec /usr/app/bin/perl  -S $0 ${1+"$@"}'
-    if 0; # not running under some shell
+#!/usr/bin/perl
 
 #BEGIN {$^W=1};