diff --git a/lib/MySQL_HostGroups_Manager.cpp b/lib/MySQL_HostGroups_Manager.cpp
index 7d94a4768..f95361bd8 100644
--- a/lib/MySQL_HostGroups_Manager.cpp
+++ b/lib/MySQL_HostGroups_Manager.cpp
@@ -1879,7 +1879,9 @@ void MySQL_HostGroups_Manager::update_hostgroup_manager_mappings() {
 					if (itr == hostgroup_server_mapping.end()) {
 						std::unique_ptr<HostGroup_Server_Mapping> server_mapping(new HostGroup_Server_Mapping(this));
 						fetched_server_mapping = server_mapping.get();
-						hostgroup_server_mapping.insert({ server_id, std::move(server_mapping) });
+						hostgroup_server_mapping.insert( std::pair<std::string,std::unique_ptr<MySQL_HostGroups_Manager::HostGroup_Server_Mapping>> {
+															server_id, std::move(server_mapping)
+															} );
 					} else {
 						fetched_server_mapping = itr->second.get();
 					}
diff --git a/lib/ProxySQL_Cluster.cpp b/lib/ProxySQL_Cluster.cpp
index 8fbc511c9..bcd196928 100644
--- a/lib/ProxySQL_Cluster.cpp
+++ b/lib/ProxySQL_Cluster.cpp
@@ -930,8 +930,8 @@ void ProxySQL_Node_Entry::set_checksums(MYSQL_RES *_r) {
 					proxy_info("Cluster: Fetch mysql_servers_v2:'YES', mysql_servers:'%s' from peer %s:%d\n", (fetch_runtime ? "YES" : "NO"),
 						hostname, port);
 
-					GloProxyCluster->pull_mysql_servers_v2_from_peer({ v->checksum, v->epoch },
-							{ runtime_mysql_server_checksum->checksum, runtime_mysql_server_checksum->epoch }, fetch_runtime);
+					GloProxyCluster->pull_mysql_servers_v2_from_peer({ v->checksum, static_cast<time_t>(v->epoch) },
+							{ runtime_mysql_server_checksum->checksum, static_cast<time_t>(runtime_mysql_server_checksum->epoch) }, fetch_runtime);
 
 					runtime_mysql_servers_already_loaded = fetch_runtime;
 				}
@@ -967,7 +967,7 @@ void ProxySQL_Node_Entry::set_checksums(MYSQL_RES *_r) {
 					if (v->diff_check >= diff_ms) {
 						proxy_debug(PROXY_DEBUG_CLUSTER, 5, "Detected peer %s:%d with mysql_servers version %llu, epoch %llu, diff_check %u. Own version: %llu, epoch: %llu. Proceeding with remote sync\n", hostname, port, v->version, v->epoch, v->diff_check, own_version, own_epoch);
 						proxy_info("Cluster: detected a peer %s:%d with mysql_servers version %llu, epoch %llu, diff_check %u. Own version: %llu, epoch: %llu. Proceeding with remote sync\n", hostname, port, v->version, v->epoch, v->diff_check, own_version, own_epoch);
-						GloProxyCluster->pull_runtime_mysql_servers_from_peer({ v->checksum, v->epoch });
+						GloProxyCluster->pull_runtime_mysql_servers_from_peer({ v->checksum, static_cast<time_t>(v->epoch) });
 					}
 				}
 				if ((v->epoch == own_epoch) && v->diff_check && ((v->diff_check % (diff_ms * 10)) == 0)) {