diff --git a/fhem/FHEM/10_FS20.pm b/fhem/FHEM/10_FS20.pm
index b088f10b2..9eee30b94 100755
--- a/fhem/FHEM/10_FS20.pm
+++ b/fhem/FHEM/10_FS20.pm
@@ -255,7 +255,7 @@ FS20_Define($$)
   $hash->{XMIT} = lc($a[2]);
   $hash->{BTN}  = lc($a[3]);
 
-  my $code = "$a[2] $a[3]";
+  my $code = lc("$a[2] $a[3]");
   my $ncode = 1;
   my $name = $a[0];
 
@@ -277,7 +277,7 @@ FS20_Define($$)
       return $u;
     }
 
-    $code = "$a[2] $a[$i+1]";
+    $code = lc("$a[2] $a[$i+1]");
     $hash->{CODE}{$ncode++} = $code;
     $defptr{$code}{$name}   = $hash;
   }
diff --git a/fhem/fhem.pl b/fhem/fhem.pl
index b86470c28..33586ccd5 100755
--- a/fhem/fhem.pl
+++ b/fhem/fhem.pl
@@ -134,7 +134,7 @@ my %intAt;			# Internal at timer hash.
 my $intAtCnt=0;
 my $reread_active = 0;
 my $AttrList = "room comment";
-my $cvsid = '$Id: fhem.pl,v 1.25 2007-09-13 07:13:50 rudolfkoenig Exp $';
+my $cvsid = '$Id: fhem.pl,v 1.26 2007-09-24 07:09:17 rudolfkoenig Exp $';
 
 $init_done = 0;
 
@@ -243,19 +243,19 @@ if($attr{global}{statefile} && -r $attr{global}{statefile}) {
 }
 SignalHandling();
 
-Log 0, "Server started (version $attr{global}{version}, pid $$)";
-
 ################################################
 # Main loop
 
-$init_done = 1;
 my $pfn = $attr{global}{pidfilename};
 if($pfn) {
-  return "$pfn: $!" if(!open(PID, ">$pfn"));
+  die "$pfn: $!\n" if(!open(PID, ">$pfn"));
   print PID $$ . "\n";
   close(PID);
 }
 
+$init_done = 1;
+Log 0, "Server started (version $attr{global}{version}, pid $$)";
+
 
 # Main Loop
 while (1) {