diff --git a/Telegram/SourceFiles/boxes/star_gift_box.cpp b/Telegram/SourceFiles/boxes/star_gift_box.cpp
index 7725d77dacc78e..85b491e18f6c4c 100644
--- a/Telegram/SourceFiles/boxes/star_gift_box.cpp
+++ b/Telegram/SourceFiles/boxes/star_gift_box.cpp
@@ -1936,19 +1936,23 @@ void Controller::rowClicked(not_null<PeerListRow*> row) {
 } // namespace
 
 void ChooseStarGiftRecipient(
-		not_null<Window::SessionController*> controller) {
-	auto initBox = [=](not_null<PeerListBox*> peersBox) {
-		peersBox->setTitle(tr::lng_gift_premium_or_stars());
-		peersBox->addButton(tr::lng_cancel(), [=] { peersBox->closeBox(); });
-	};
-
-	auto listController = std::make_unique<Controller>(
-		&controller->session(),
+		not_null<Window::SessionController*> window) {
+	auto controller = std::make_unique<Controller>(
+		&window->session(),
 		[=](not_null<PeerData*> peer) {
-			ShowStarGiftBox(controller, peer);
+			ShowStarGiftBox(window, peer);
 		});
-	controller->show(
-		Box<PeerListBox>(std::move(listController), std::move(initBox)),
+	const auto controllerRaw = controller.get();
+	auto initBox = [=](not_null<PeerListBox*> box) {
+		box->setTitle(tr::lng_gift_premium_or_stars());
+		box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+
+		box->noSearchSubmits() | rpl::start_with_next([=] {
+			controllerRaw->noSearchSubmit();
+		}, box->lifetime());
+	};
+	window->show(
+		Box<PeerListBox>(std::move(controller), std::move(initBox)),
 		LayerOption::KeepOther);
 }
 
diff --git a/Telegram/SourceFiles/boxes/transfer_gift_box.cpp b/Telegram/SourceFiles/boxes/transfer_gift_box.cpp
index a0bc590aef943e..d92204e0b95ff8 100644
--- a/Telegram/SourceFiles/boxes/transfer_gift_box.cpp
+++ b/Telegram/SourceFiles/boxes/transfer_gift_box.cpp
@@ -406,7 +406,6 @@ void ShowTransferGiftBox(
 	auto initBox = [=](not_null<PeerListBox*> box) {
 		box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
 
-
 		box->noSearchSubmits() | rpl::start_with_next([=] {
 			controllerRaw->noSearchSubmit();
 		}, box->lifetime());
diff --git a/Telegram/SourceFiles/history/view/history_view_service_message.cpp b/Telegram/SourceFiles/history/view/history_view_service_message.cpp
index 225ace5ac24693..02a4aed23485c9 100644
--- a/Telegram/SourceFiles/history/view/history_view_service_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_service_message.cpp
@@ -432,8 +432,6 @@ QRect Service::countGeometry() const {
 }
 
 void Service::animateReaction(Ui::ReactionFlyAnimationArgs &&args) {
-	const auto item = data();
-
 	auto g = countGeometry();
 	if (g.width() < 1 || isHidden()) {
 		return;
@@ -541,7 +539,6 @@ void Service::draw(Painter &p, const PaintContext &context) const {
 	}
 
 	const auto st = context.st;
-	auto clip = context.clip;
 	if (const auto bar = Get<UnreadBar>()) {
 		auto unreadbarh = bar->height();
 		auto dateh = 0;