diff --git a/lib/base/scriptglobal.cpp b/lib/base/scriptglobal.cpp
index e85e9ecb5..111634d81 100644
--- a/lib/base/scriptglobal.cpp
+++ b/lib/base/scriptglobal.cpp
@@ -53,7 +53,7 @@ void ScriptGlobal::Set(const String& name, const Value& value)
 				if (!parent->Get(token, &vparent)) {
 					Namespace::Ptr dict = new Namespace();
 					parent->Set(token, dict);
-					parent = dict;
+					parent = std::move(dict);
 				} else {
 					parent = vparent;
 				}
diff --git a/lib/db_ido/dbconnection.cpp b/lib/db_ido/dbconnection.cpp
index 62160d86d..2fd2e8ee1 100644
--- a/lib/db_ido/dbconnection.cpp
+++ b/lib/db_ido/dbconnection.cpp
@@ -486,7 +486,7 @@ void DbConnection::UpdateObject(const ConfigObject::Ptr& object)
 			} else {
 				dbobj->SendConfigUpdateLight();
 			}
-		} else if (!active) {
+		} else {
 			/* This may happen on reload/restart actions too
 			 * and is blocked above already.
 			 *
diff --git a/lib/db_ido/dbevents.cpp b/lib/db_ido/dbevents.cpp
index 8358824e7..4350ba7ab 100644
--- a/lib/db_ido/dbevents.cpp
+++ b/lib/db_ido/dbevents.cpp
@@ -401,7 +401,7 @@ void DbEvents::AddCommentInternal(std::vector<DbQuery>& queries, const Comment::
 	}
 
 	query1.Category = DbCatComment;
-	query1.Fields = fields1;
+	query1.Fields = std::move(fields1);
 	queries.emplace_back(std::move(query1));
 }
 
@@ -548,7 +548,7 @@ void DbEvents::AddDowntimeInternal(std::vector<DbQuery>& queries, const Downtime
 	}
 
 	query1.Category = DbCatDowntime;
-	query1.Fields = fields1;
+	query1.Fields = std::move(fields1);
 	queries.emplace_back(std::move(query1));
 
 	/* host/service status */
@@ -576,7 +576,7 @@ void DbEvents::AddDowntimeInternal(std::vector<DbQuery>& queries, const Downtime
 		Dictionary::Ptr fields2 = new Dictionary();
 		fields2->Set("scheduled_downtime_depth", checkable->GetDowntimeDepth());
 
-		query2.Fields = fields2;
+		query2.Fields = std::move(fields2);
 		query2.WhereCriteria->Set("instance_id", 0); /* DbConnection class fills in real ID */
 
 		queries.emplace_back(std::move(query2));
@@ -609,9 +609,6 @@ void DbEvents::RemoveDowntimeInternal(std::vector<DbQuery>& queries, const Downt
 	query1.WhereCriteria->Set("name", downtime->GetName());
 	queries.emplace_back(std::move(query1));
 
-	/* History - update actual_end_time, was_cancelled for service (and host in case) */
-	std::pair<unsigned long, unsigned long> timeBag = ConvertTimestamp(Utility::GetTime());
-
 	DbQuery query3;
 	query3.Table = "downtimehistory";
 	query3.Type = DbQueryUpdate;
@@ -621,12 +618,15 @@ void DbEvents::RemoveDowntimeInternal(std::vector<DbQuery>& queries, const Downt
 	fields3->Set("was_cancelled", downtime->GetWasCancelled() ? 1 : 0);
 
 	if (downtime->GetFixed() || (!downtime->GetFixed() && downtime->GetTriggerTime() > 0)) {
+		/* History - update actual_end_time, was_cancelled for service (and host in case) */
+		std::pair<unsigned long, unsigned long> timeBag = ConvertTimestamp(Utility::GetTime());
+
 		fields3->Set("actual_end_time", DbValue::FromTimestamp(timeBag.first));
 		fields3->Set("actual_end_time_usec", timeBag.second);
 	}
 
 	fields3->Set("is_in_effect", 0);
-	query3.Fields = fields3;
+	query3.Fields = std::move(fields3);
 
 	query3.WhereCriteria = new Dictionary({
 		{ "object_id", checkable },
@@ -663,7 +663,7 @@ void DbEvents::RemoveDowntimeInternal(std::vector<DbQuery>& queries, const Downt
 	Dictionary::Ptr fields4 = new Dictionary();
 	fields4->Set("scheduled_downtime_depth", checkable->GetDowntimeDepth());
 
-	query4.Fields = fields4;
+	query4.Fields = std::move(fields4);
 	query4.WhereCriteria->Set("instance_id", 0); /* DbConnection class fills in real ID */
 
 	queries.emplace_back(std::move(query4));
@@ -787,7 +787,7 @@ void DbEvents::AddAcknowledgementHistory(const Checkable::Ptr& checkable, const
 	if (endpoint)
 		fields1->Set("endpoint_object_id", endpoint);
 
-	query1.Fields = fields1;
+	query1.Fields = std::move(fields1);
 	DbObject::OnQuery(query1);
 }
 
@@ -959,7 +959,7 @@ void DbEvents::AddStateChangeHistory(const Checkable::Ptr& checkable, const Chec
 	if (endpoint)
 		fields1->Set("endpoint_object_id", endpoint);
 
-	query1.Fields = fields1;
+	query1.Fields = std::move(fields1);
 	DbObject::OnQuery(query1);
 }
 
@@ -1260,7 +1260,7 @@ void DbEvents::AddLogHistory(const Checkable::Ptr& checkable, const String& buff
 	if (endpoint)
 		fields1->Set("endpoint_object_id", endpoint);
 
-	query1.Fields = fields1;
+	query1.Fields = std::move(fields1);
 	DbObject::OnQuery(query1);
 }
 
@@ -1303,7 +1303,7 @@ void DbEvents::AddFlappingChangedHistory(const Checkable::Ptr& checkable)
 	if (endpoint)
 		fields1->Set("endpoint_object_id", endpoint);
 
-	query1.Fields = fields1;
+	query1.Fields = std::move(fields1);
 	DbObject::OnQuery(query1);
 }
 
@@ -1343,7 +1343,7 @@ void DbEvents::AddEnableFlappingChangedHistory(const Checkable::Ptr& checkable)
 	if (endpoint)
 		fields1->Set("endpoint_object_id", endpoint);
 
-	query1.Fields = fields1;
+	query1.Fields = std::move(fields1);
 	DbObject::OnQuery(query1);
 }
 
@@ -1403,7 +1403,7 @@ void DbEvents::AddCheckableCheckHistory(const Checkable::Ptr& checkable, const C
 	if (endpoint)
 		fields1->Set("endpoint_object_id", endpoint);
 
-	query1.Fields = fields1;
+	query1.Fields = std::move(fields1);
 	DbObject::OnQuery(query1);
 }
 
@@ -1446,7 +1446,7 @@ void DbEvents::AddEventHandlerHistory(const Checkable::Ptr& checkable)
 	if (endpoint)
 		fields1->Set("endpoint_object_id", endpoint);
 
-	query1.Fields = fields1;
+	query1.Fields = std::move(fields1);
 	DbObject::OnQuery(query1);
 }
 
@@ -1471,7 +1471,7 @@ void DbEvents::AddExternalCommandHistory(double time, const String& command, con
 	if (endpoint)
 		fields1->Set("endpoint_object_id", endpoint);
 
-	query1.Fields = fields1;
+	query1.Fields = std::move(fields1);
 	DbObject::OnQuery(query1);
 }
 
diff --git a/lib/db_ido/dbobject.cpp b/lib/db_ido/dbobject.cpp
index 406bf5243..fe457b23c 100644
--- a/lib/db_ido/dbobject.cpp
+++ b/lib/db_ido/dbobject.cpp
@@ -158,7 +158,7 @@ void DbObject::SendStatusUpdate()
 	query.Table = GetType()->GetTable() + "status";
 	query.Type = DbQueryInsert | DbQueryUpdate;
 	query.Category = DbCatState;
-	query.Fields = fields;
+	query.Fields = std::move(fields);
 	query.Fields->Set(GetType()->GetIDColumn(), GetObject());
 
 	/* do not override endpoint_object_id for endpoints & zones */