diff --git a/Telegram/SourceFiles/boxes/star_gift_box.cpp b/Telegram/SourceFiles/boxes/star_gift_box.cpp
index 483112d598..884cf012fd 100644
--- a/Telegram/SourceFiles/boxes/star_gift_box.cpp
+++ b/Telegram/SourceFiles/boxes/star_gift_box.cpp
@@ -1292,9 +1292,6 @@ void SendGift(
 		const auto &action = message.vaction();
 		action.match([&](const MTPDmessageActionStarGiftUnique &data) {
 			if (const auto gift = Api::FromTL(session, data.vgift())) {
-				const auto from = data.vfrom_id()
-					? peerFromMTP(*data.vfrom_id())
-					: PeerId();
 				const auto to = data.vpeer()
 					? peerFromMTP(*data.vpeer())
 					: PeerId();
@@ -5351,7 +5348,9 @@ void UpgradeBox(
 				rpl::single(tr::marked()),
 				costText()),
 			rpl::conditional(
-				showPrices ? state->upgrading.value() : rpl::single(true),
+				(showPrices
+					? state->upgrading.value()
+					: (rpl::single(true) | rpl::type_erased)),
 				rpl::single(tr::marked()),
 				std::move(subtext)),
 			st::resaleButtonTitle,
diff --git a/Telegram/SourceFiles/media/system_media_controls_manager.cpp b/Telegram/SourceFiles/media/system_media_controls_manager.cpp
index c54bf11518..c32cc7ebcf 100644
--- a/Telegram/SourceFiles/media/system_media_controls_manager.cpp
+++ b/Telegram/SourceFiles/media/system_media_controls_manager.cpp
@@ -71,7 +71,6 @@ SystemMediaControlsManager::SystemMediaControlsManager()
 
 	mediaPlayer->updatedNotifier(
 	) | trackFilter | rpl::map([=](const TrackState &state) {
-		const auto type = state.id.type();
 		using namespace Media::Player;
 		if (_streamed) {
 			const auto &player = _streamed->player();