diff --git a/server/core/adminusers.c b/server/core/adminusers.c
index 6ed70ed3c..61cd7c077 100644
--- a/server/core/adminusers.c
+++ b/server/core/adminusers.c
@@ -298,6 +298,7 @@ char* admin_remove_user(
                         fname,
                         err)));
                 fclose(fp);
+                fclose(fp_tmp);
 		unlink(fname_tmp);
 		return ADMIN_ERR_PWDFILEACCESS;
         }
@@ -325,6 +326,7 @@ char* admin_remove_user(
                                 fname,
                                 err)));
                         fclose(fp);
+                	fclose(fp_tmp);
                         unlink(fname_tmp);
                         return ADMIN_ERR_PWDFILEACCESS;
                 }
diff --git a/server/core/filter.c b/server/core/filter.c
index 405a01470..99525f7f6 100644
--- a/server/core/filter.c
+++ b/server/core/filter.c
@@ -359,7 +359,7 @@ DOWNSTREAM	*me;
 UPSTREAM *
 filterUpstream(FILTER_DEF *filter, void *fsession, UPSTREAM *upstream)
 {
-UPSTREAM	*me;
+UPSTREAM	*me = NULL;
 
 	/*
 	 * The the filter has no setUpstream entry point then is does
diff --git a/server/core/service.c b/server/core/service.c
index 1102dabb4..1b79db346 100644
--- a/server/core/service.c
+++ b/server/core/service.c
@@ -1008,7 +1008,7 @@ bool service_set_param_value (
 {
         char* p;
         int   valint;
-        bool  succp;
+        bool  succp = true;
         
         /**
          * Find out whether the value is numeric and ends with '%' or '\0'