2 files changed, 6 insertions, 5 deletions
diff --git a/source4/pidl/lib/Parse/Pidl/Dump.pm b/source4/pidl/lib/Parse/Pidl/Dump.pm
index bca599262a..7f426c1c0b 100644
--- a/source4/pidl/lib/Parse/Pidl/Dump.pm
+++ b/source4/pidl/lib/Parse/Pidl/Dump.pm
@@ -208,9 +208,9 @@ sub DumpFunction($)
 
     $res .= DumpType($function->{RETURN_TYPE});
     $res .= " $function->{NAME}(\n";
-    for my $d (@{$function->{DATA}}) {
-	$first || ($res .= ",\n"); $first = 0;
-	$res .= DumpElement($d);
+    for my $d (@{$function->{ELEMENTS}}) {
+		unless ($first) { $res .= ",\n"; } $first = 0;
+		$res .= DumpElement($d);
     }
     $res .= "\n);\n\n";
 
diff --git a/source4/pidl/pidl b/source4/pidl/pidl
index 14be05c042..1cc2ee44cb 100755
--- a/source4/pidl/pidl
+++ b/source4/pidl/pidl
@@ -8,8 +8,9 @@
 # released under the GNU GPL
 
 use strict;
-
-use lib "lib";
+use FindBin qw($RealBin);
+use lib "$RealBin";
+use lib "$RealBin/lib";
 use Getopt::Long;
 use File::Basename;
 use Parse::Pidl;