diff --git a/src/manager/UpstreamManager.cc b/src/manager/UpstreamManager.cc
index 9b75fa7f..a1d1cf43 100644
--- a/src/manager/UpstreamManager.cc
+++ b/src/manager/UpstreamManager.cc
@@ -70,6 +70,7 @@ int UpstreamManager::upstream_create_consistent_hash(const std::string& name,
 		return 0;
 	}
 
+	delete policy;
 	return -1;
 }
 
@@ -85,6 +86,7 @@ int UpstreamManager::upstream_create_weighted_random(const std::string& name,
 		return 0;
 	}
 
+	delete policy;
 	return -1;
 }
 
@@ -103,6 +105,7 @@ int UpstreamManager::upstream_create_manual(const std::string& name,
 		return 0;
 	}
 
+	delete policy;
 	return -1;
 }
 
diff --git a/src/nameservice/WFServiceGovernance.cc b/src/nameservice/WFServiceGovernance.cc
index afd4ca31..80fc4a4f 100644
--- a/src/nameservice/WFServiceGovernance.cc
+++ b/src/nameservice/WFServiceGovernance.cc
@@ -226,7 +226,7 @@ void WFServiceGovernance::success(RouteManager::RouteResult *result,
 	else
 		server = (EndpointAddress *)tracing->data;
 
-	this->rwlock.rlock();
+	this->rwlock.wlock();
 	this->recover_server_from_breaker(server);
 	this->rwlock.unlock();
 
@@ -246,7 +246,7 @@ void WFServiceGovernance::failed(RouteManager::RouteResult *result,
 	else
 		server = (EndpointAddress *)tracing->data;
 
-	this->rwlock.rlock();
+	this->rwlock.wlock();
 	size_t fail_count = ++server->fail_count;
 	if (fail_count == server->params->max_fails)
 		this->fuse_server_to_breaker(server);
@@ -428,7 +428,7 @@ int WFServiceGovernance::replace_server(const std::string& address,
 
 void WFServiceGovernance::enable_server(const std::string& address)
 {
-	this->rwlock.rlock();
+	this->rwlock.wlock();
 	const auto map_it = this->server_map.find(address);
 	if (map_it != this->server_map.cend())
 	{
@@ -440,7 +440,7 @@ void WFServiceGovernance::enable_server(const std::string& address)
 
 void WFServiceGovernance::disable_server(const std::string& address)
 {
-	this->rwlock.rlock();
+	this->rwlock.wlock();
 	const auto map_it = this->server_map.find(address);
 	if (map_it != this->server_map.cend())
 	{