diff --git a/Telegram/SourceFiles/boxes/create_poll_box.cpp b/Telegram/SourceFiles/boxes/create_poll_box.cpp
index f4e55db2c4..7af7f12cc6 100644
--- a/Telegram/SourceFiles/boxes/create_poll_box.cpp
+++ b/Telegram/SourceFiles/boxes/create_poll_box.cpp
@@ -2413,7 +2413,7 @@ object_ptr<Ui::RpWidget> CreatePollBox::setupContent() {
 			},
 			rpl::single(!!(_chosen & PollData::Flag::PublicVotes))
 				| rpl::then(state->showWhoVotedForceOn.events()),
-			st::detailedSettingsButtonStyle)
+			st::detailedSettingsButtonStyle).get()
 		: nullptr;
 	const auto multiple = AddPollToggleButton(
 		container,
@@ -2437,7 +2437,7 @@ object_ptr<Ui::RpWidget> CreatePollBox::setupContent() {
 			},
 			rpl::single(!!(_chosen & PollData::Flag::OpenAnswers))
 				| rpl::then(state->addOptionsForceOff.events()),
-			st::detailedSettingsButtonStyle)
+			st::detailedSettingsButtonStyle).get()
 		: nullptr;
 	const auto revoting = AddPollToggleButton(
 		container,
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 2c8e5d70f6..a71353bba7 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -168,6 +168,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/popup_menu.h"
 #include "ui/widgets/tooltip.h"
 #include "ui/item_text_options.h"
+#include "main/main_app_config.h"
 #include "main/main_session.h"
 #include "main/main_session_settings.h"
 #include "main/session/send_as_peers.h"
diff --git a/Telegram/SourceFiles/history/view/media/history_view_poll.cpp b/Telegram/SourceFiles/history/view/media/history_view_poll.cpp
index 7243bb0065..a1475305a3 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_poll.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_poll.cpp
@@ -1826,7 +1826,6 @@ void Poll::paintAddOption(
 		return;
 	}
 	const auto stm = context.messageStyle();
-	const auto height = addOptionHeight();
 	const auto &padding = st::historyPollAnswerPaddingNoMedia;
 	const auto textTop = top + padding.top();