diff --git a/Telegram/SourceFiles/calls/calls_choose_join_as.cpp b/Telegram/SourceFiles/calls/calls_choose_join_as.cpp
index d0caf094e..d58850b4b 100644
--- a/Telegram/SourceFiles/calls/calls_choose_join_as.cpp
+++ b/Telegram/SourceFiles/calls/calls_choose_join_as.cpp
@@ -142,7 +142,7 @@ void ScheduleGroupCallBox(
 	};
 	const auto max = [] {
 		return base::unixtime::serialize(
-			QDateTime(QDate::currentDate().addDays(8))) - 1;
+			QDateTime(QDate::currentDate().addDays(8), QTime(0, 0))) - 1;
 	};
 
 	// At least half an hour later, at zero minutes/seconds.
diff --git a/Telegram/SourceFiles/calls/calls_group_panel.cpp b/Telegram/SourceFiles/calls/calls_group_panel.cpp
index 2936e47bd..caa700953 100644
--- a/Telegram/SourceFiles/calls/calls_group_panel.cpp
+++ b/Telegram/SourceFiles/calls/calls_group_panel.cpp
@@ -142,7 +142,8 @@ private:
 			lt_date,
 			rpl::single(langDayOfMonthFull(dateDay.date())),
 			lt_time,
-			rpl::single(time));
+			rpl::single(time)
+		) | rpl::type_erased();
 		auto tomorrow = tr::lng_group_call_starts_short_tomorrow(
 			lt_time,
 			rpl::single(time));
@@ -156,7 +157,7 @@ private:
 			std::min(tillAfter, kDay) * crl::time(1000)
 		) | rpl::map([=] {
 			return rpl::duplicate(exact);
-		})) | rpl::flatten_latest();
+		})) | rpl::flatten_latest() | rpl::type_erased();
 
 		auto tomorrowAndAfter = rpl::single(
 			std::move(tomorrow)
@@ -164,7 +165,7 @@ private:
 			std::min(tillToday, kDay) * crl::time(1000)
 		) | rpl::map([=] {
 			return rpl::duplicate(todayAndAfter);
-		})) | rpl::flatten_latest();
+		})) | rpl::flatten_latest() | rpl::type_erased();
 
 		auto full = rpl::single(
 			rpl::duplicate(exact)
@@ -172,7 +173,7 @@ private:
 			tillTomorrow * crl::time(1000)
 		) | rpl::map([=] {
 			return rpl::duplicate(tomorrowAndAfter);
-		})) | rpl::flatten_latest();
+		})) | rpl::flatten_latest() | rpl::type_erased();
 
 		if (tillTomorrow > 0) {
 			return full;
diff --git a/Telegram/SourceFiles/mtproto/details/mtproto_dc_key_creator.cpp b/Telegram/SourceFiles/mtproto/details/mtproto_dc_key_creator.cpp
index 0c5514e71..8da3c22c9 100644
--- a/Telegram/SourceFiles/mtproto/details/mtproto_dc_key_creator.cpp
+++ b/Telegram/SourceFiles/mtproto/details/mtproto_dc_key_creator.cpp
@@ -502,8 +502,8 @@ void DcKeyCreator::dhClientParamsSend(not_null<Attempt*> attempt) {
 	AuthKey::FillData(attempt->authKey, computedAuthKey);
 
 	auto auth_key_sha = openssl::Sha1(attempt->authKey);
-	memcpy(&attempt->data.auth_key_aux_hash, auth_key_sha.data(), 8);
-	memcpy(&attempt->data.auth_key_hash, auth_key_sha.data() + 12, 8);
+	memcpy(&attempt->data.auth_key_aux_hash.v, auth_key_sha.data(), 8);
+	memcpy(&attempt->data.auth_key_hash.v, auth_key_sha.data() + 12, 8);
 
 	const auto client_dh_inner = MTP_client_DH_inner_data(
 		attempt->data.nonce,
diff --git a/Telegram/SourceFiles/payments/smartglocal/smartglocal_api_client.cpp b/Telegram/SourceFiles/payments/smartglocal/smartglocal_api_client.cpp
index 70984460c..0fca1b7f0 100644
--- a/Telegram/SourceFiles/payments/smartglocal/smartglocal_api_client.cpp
+++ b/Telegram/SourceFiles/payments/smartglocal/smartglocal_api_client.cpp
@@ -16,9 +16,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include <QtNetwork/QNetworkReply>
 #include <crl/crl_on_main.h>
 
-#include <windows.h>
-#include <debugapi.h>
-
 namespace SmartGlocal {
 namespace {
 
diff --git a/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm b/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm
index 310b2829b..8affa37cb 100644
--- a/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm
@@ -111,7 +111,7 @@ using Manager = Platform::Notifications::Manager;
 	const auto my = Window::Notifications::Manager::NotificationId{
 		.full = Manager::FullPeer{
 			.sessionId = notificationSessionId,
-			.peerId = notificationPeerId
+			.peerId = PeerId(notificationPeerId)
 		},
 		.msgId = notificationMsgId
 	};
@@ -260,11 +260,11 @@ void Manager::Private::showNotification(
 
 	NSUserNotification *notification = [[[NSUserNotification alloc] init] autorelease];
 	if ([notification respondsToSelector:@selector(setIdentifier:)]) {
-		auto identifier = _managerIdString + '_' + QString::number(peer->id) + '_' + QString::number(msgId);
+		auto identifier = _managerIdString + '_' + QString::number(peer->id.value) + '_' + QString::number(msgId);
 		auto identifierValue = Q2NSString(identifier);
 		[notification setIdentifier:identifierValue];
 	}
-	[notification setUserInfo:[NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithUnsignedLongLong:peer->session().uniqueId()],@"session",[NSNumber numberWithUnsignedLongLong:peer->id],@"peer",[NSNumber numberWithInt:msgId],@"msgid",[NSNumber numberWithUnsignedLongLong:_managerId],@"manager",nil]];
+	[notification setUserInfo:[NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithUnsignedLongLong:peer->session().uniqueId()],@"session",[NSNumber numberWithUnsignedLongLong:peer->id.value],@"peer",[NSNumber numberWithInt:msgId],@"msgid",[NSNumber numberWithUnsignedLongLong:_managerId],@"manager",nil]];
 
 	[notification setTitle:Q2NSString(title)];
 	[notification setSubtitle:Q2NSString(subtitle)];
@@ -331,7 +331,7 @@ void Manager::Private::clearingThreadLoop() {
 					return clearFromSessions.contains(notificationSessionId)
 						|| clearFromPeers.contains(FullPeer{
 							.sessionId = notificationSessionId,
-							.peerId = notificationPeerId
+							.peerId = PeerId(notificationPeerId)
 						});
 				}
 			}