diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index f8910a4cb2..841ba8f2d5 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-09  Ramon Novoa  <rnovoa@artica.es>
+
+	* lib/PandoraFMS/Server.pm, bin/pandora_server: Small fixes to avoid
+	  warnings.
+
 2009-10-07  Ramon Novoa  <rnovoa@artica.es>
 
 	* lib/PandoraFMS/SNMPServer.pm,
diff --git a/pandora_server/bin/pandora_server b/pandora_server/bin/pandora_server
index bf39789276..37bf5bf171 100755
--- a/pandora_server/bin/pandora_server
+++ b/pandora_server/bin/pandora_server
@@ -201,6 +201,7 @@ while (1) {
 		
 		# Unmute
 		open(STDOUT, ">&OLDOUT");
+		close (OLDOUT);
 	}
 
 	threads->yield;
diff --git a/pandora_server/lib/PandoraFMS/Server.pm b/pandora_server/lib/PandoraFMS/Server.pm
index f2372bfae4..c1ef8a5c47 100644
--- a/pandora_server/lib/PandoraFMS/Server.pm
+++ b/pandora_server/lib/PandoraFMS/Server.pm
@@ -242,7 +242,7 @@ sub restartEvent ($$) {
 
 	return unless defined ($self->{'_dbh'});
 	pandora_event ($self->{'_pa_config'}, $self->{'_pa_config'}->{'servername'} .
-	               $ServerTypes[$self->{'_server_type'}] . " RESTARTING ($msg)",
+	               $ServerTypes[$self->{'_server_type'}] . " RESTARTING" . (defined ($msg) ? " ($msg)" : ''),
 	               0, 0, 4, 0, 0, 'system', $self->{'_dbh'});
 }