diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index 1f6964b63..b47fad100 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -4983,7 +4983,7 @@ void ApiWrap::clearUnconfirmedPassword() {
 rpl::producer<Core::CloudPasswordState> ApiWrap::passwordState() const {
 	return _passwordState
 		? _passwordStateChanges.events_starting_with_copy(*_passwordState)
-		: _passwordStateChanges.events();
+		: (_passwordStateChanges.events() | rpl::type_erased());
 }
 
 auto ApiWrap::passwordStateCurrent() const
diff --git a/Telegram/SourceFiles/settings/settings_general.cpp b/Telegram/SourceFiles/settings/settings_general.cpp
index 307d35621..5f63157de 100644
--- a/Telegram/SourceFiles/settings/settings_general.cpp
+++ b/Telegram/SourceFiles/settings/settings_general.cpp
@@ -381,8 +381,7 @@ void SetupTray(not_null<Ui::VerticalLayout*> container) {
 }
 
 General::General(QWidget *parent, UserData *self)
-: Section(parent)
-, _self(self) {
+: Section(parent) {
 	setupContent();
 }
 
diff --git a/Telegram/SourceFiles/settings/settings_general.h b/Telegram/SourceFiles/settings/settings_general.h
index 2ef8c1a29..62d303dc5 100644
--- a/Telegram/SourceFiles/settings/settings_general.h
+++ b/Telegram/SourceFiles/settings/settings_general.h
@@ -25,8 +25,6 @@ public:
 private:
 	void setupContent();
 
-	UserData *_self = nullptr;
-
 };
 
 } // namespace Settings
diff --git a/Telegram/SourceFiles/settings/settings_intro.cpp b/Telegram/SourceFiles/settings/settings_intro.cpp
index dd8c3a0b6..24a81732b 100644
--- a/Telegram/SourceFiles/settings/settings_intro.cpp
+++ b/Telegram/SourceFiles/settings/settings_intro.cpp
@@ -196,9 +196,9 @@ private:
 
 IntroWidget::IntroWidget(QWidget *parent)
 : RpWidget(parent)
-, _topShadow(this)
 , _wrap(this)
-, _scroll(Ui::CreateChild<Ui::ScrollArea>(_wrap.data(), st::infoScroll)) {
+, _scroll(Ui::CreateChild<Ui::ScrollArea>(_wrap.data(), st::infoScroll))
+, _topShadow(this) {
 	_wrap->setAttribute(Qt::WA_OpaquePaintEvent);
 	_wrap->paintRequest(
 	) | rpl::start_with_next([=](QRect clip) {
diff --git a/Telegram/SourceFiles/settings/settings_privacy_security.cpp b/Telegram/SourceFiles/settings/settings_privacy_security.cpp
index b80b9db16..51117ad98 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_security.cpp
+++ b/Telegram/SourceFiles/settings/settings_privacy_security.cpp
@@ -193,7 +193,7 @@ rpl::producer<bool> SetupLocalPasscode(
 
 	wrap->toggleOn(base::duplicate(has));
 
-	return std::move(has);
+	return has;
 }
 
 bool CheckEditCloudPassword() {
@@ -365,7 +365,7 @@ rpl::producer<bool> SetupCloudPassword(
 		reloadOnActivation);
 
 	Auth().api().reloadPasswordState();
-	return std::move(has);
+	return has;
 }
 
 void SetupSelfDestruction(not_null<Ui::VerticalLayout*> container) {