diff --git a/conf.c b/conf.c
index 7d3f14e6..3736f825 100644
--- a/conf.c
+++ b/conf.c
@@ -150,8 +150,6 @@ bool install_term_signal_handler(int signum, bool ignore_if_already_ignored)
 
 int main(int argc, char ** argv)
 {
-  int ret;
-
   if (getenv("HOME") == NULL)
   {
     log_error("Environment variable HOME not set");
@@ -174,8 +172,6 @@ int main(int argc, char ** argv)
     dbus_connection_read_write_dispatch(cdbus_g_dbus_connection, 50);
   }
 
-  ret = 0;
-
   disconnect_dbus();
   return 0;
 }
diff --git a/daemon/cmd_save_project.c b/daemon/cmd_save_project.c
index da1af9eb..ac9293c3 100644
--- a/daemon/cmd_save_project.c
+++ b/daemon/cmd_save_project.c
@@ -2,7 +2,7 @@
 /*
  * LADI Session Handler (ladish)
  *
- * Copyright (C) 2010 Nedko Arnaudov <nedko@arnaudov.name>
+ * Copyright (C) 2010,2011 Nedko Arnaudov <nedko@arnaudov.name>
  *
  **************************************************************************
  * This file contains implementation of the "save project" command
@@ -42,7 +42,6 @@ struct ladish_command_save_project
 
 static bool run(void * command_context)
 {
-  bool ret;
   ladish_room_handle room;
 
   ASSERT(cmd_ptr->command.state == LADISH_COMMAND_STATE_PENDING);
@@ -55,7 +54,7 @@ static bool run(void * command_context)
     return false;
   }
 
-  ret = ladish_room_save_project(room, cmd_ptr->project_dir, cmd_ptr->project_name);
+  ladish_room_save_project(room, cmd_ptr->project_dir, cmd_ptr->project_name);
 
   cmd_ptr->command.state = LADISH_COMMAND_STATE_DONE;
 
diff --git a/daemon/main.c b/daemon/main.c
index 3f4cbe55..5c914b2d 100644
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -437,5 +437,5 @@ exit:
   log_info("LADI session handler deactivated");
   log_info("------------------");
 
-  exit(EXIT_SUCCESS);
+  exit(ret);
 }
diff --git a/jmcore.c b/jmcore.c
index 7837b25e..ec855dab 100644
--- a/jmcore.c
+++ b/jmcore.c
@@ -211,8 +211,6 @@ bool install_term_signal_handler(int signum, bool ignore_if_already_ignored)
 
 int main(int argc, char ** argv)
 {
-  int ret;
-
   INIT_LIST_HEAD(&g_pairs);
 
   install_term_signal_handler(SIGTERM, false);
@@ -230,8 +228,6 @@ int main(int argc, char ** argv)
     bury_zombie_pairs();
   }
 
-  ret = 0;
-
   while (!list_empty(&g_pairs))
   {
     destroy_pair(list_entry(g_pairs.next, struct port_pair, siblings));