diff --git a/Telegram/SourceFiles/mainwindow.h b/Telegram/SourceFiles/mainwindow.h
index b1d8fc839f..0fd6813a89 100644
--- a/Telegram/SourceFiles/mainwindow.h
+++ b/Telegram/SourceFiles/mainwindow.h
@@ -144,7 +144,7 @@ public:
 	bool isActive(bool cached = true) const;
 	void hideMediaview();
 
-	QImage iconWithCounter(int size, int count, const style::color &bg, const style::color &fg, bool smallIcon);
+	QImage iconWithCounter(int size, int count, const style::color &bg, const style::color &fg, bool smallIcon) override;
 
 	bool contentOverlapped(const QRect &globalRect);
 	bool contentOverlapped(QWidget *w, QPaintEvent *e) {
@@ -225,7 +225,7 @@ private:
 
 	QPixmap grabInner();
 
-	void placeSmallCounter(QImage &img, int size, int count, const style::color &bg, const QPoint &shift, const style::color &color);
+	void placeSmallCounter(QImage &img, int size, int count, const style::color &bg, const QPoint &shift, const style::color &color) override;
 	QImage icon16, icon32, icon64, iconbig16, iconbig32, iconbig64;
 
 	typedef QPair<QString, MTPMessageMedia> DelayedServiceMsg;
diff --git a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.h b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.h
index c8e0583e2e..8d0112450f 100644
--- a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.h
+++ b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.h
@@ -28,6 +28,14 @@ namespace Notifications {
 inline void defaultNotificationShown(QWidget *widget) {
 }
 
+inline bool skipAudio() {
+	return false;
+}
+
+inline bool skipToast() {
+	return false;
+}
+
 class Manager : public Window::Notifications::NativeManager {
 public:
 	Manager();
diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.mm b/Telegram/SourceFiles/platform/mac/main_window_mac.mm
index ca658345a9..f165dc88af 100644
--- a/Telegram/SourceFiles/platform/mac/main_window_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/main_window_mac.mm
@@ -25,7 +25,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 #include "historywidget.h"
 #include "localstorage.h"
 #include "window/notifications_manager_default.h"
-#include "platform/mac/notifications_manager_mac.h"
+#include "platform/platform_notifications_manager.h"
 #include "boxes/contactsbox.h"
 #include "boxes/aboutbox.h"
 
@@ -189,11 +189,6 @@ void MainWindow::psUpdateCounter() {
 	}
 }
 
-void MainWindow::psInitFrameless() {
-	psUpdatedPositionTimer.setSingleShot(true);
-	connect(&psUpdatedPositionTimer, SIGNAL(timeout()), this, SLOT(psSavePosition()));
-}
-
 void MainWindow::psFirstShow() {
 	psUpdateMargins();
 
@@ -258,7 +253,7 @@ void MainWindow::createGlobalMenu() {
 
 		if (!App::self()) return;
 		Ui::showLayer(new ContactsBox());
-	}, SLOT(action()));
+	}), SLOT(action()));
 	psAddContact = window->addAction(lang(lng_mac_menu_add_contact), App::wnd(), SLOT(onShowAddContact()));
 	window->addSeparator();
 	psNewGroup = window->addAction(lang(lng_mac_menu_new_group), App::wnd(), SLOT(onShowNewGroup()));
diff --git a/Telegram/SourceFiles/platform/mac/notifications_manager_mac.h b/Telegram/SourceFiles/platform/mac/notifications_manager_mac.h
index 631021944b..35c1d4bcaf 100644
--- a/Telegram/SourceFiles/platform/mac/notifications_manager_mac.h
+++ b/Telegram/SourceFiles/platform/mac/notifications_manager_mac.h
@@ -25,6 +25,14 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 namespace Platform {
 namespace Notifications {
 
+inline bool skipAudio() {
+	return false;
+}
+
+inline bool skipToast() {
+	return false;
+}
+
 class Manager : public Window::Notifications::NativeManager {
 public:
 	Manager();
diff --git a/Telegram/SourceFiles/platform/platform_window_title.h b/Telegram/SourceFiles/platform/platform_window_title.h
index b124c469f7..6291c5d7e8 100644
--- a/Telegram/SourceFiles/platform/platform_window_title.h
+++ b/Telegram/SourceFiles/platform/platform_window_title.h
@@ -27,7 +27,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 #else // Q_OS_WIN
 namespace Platform {
 
-inline Window::TitleWidget *CreateTitleWidget() {
+inline Window::TitleWidget *CreateTitleWidget(QWidget *parent) {
 	return nullptr;
 }
 
diff --git a/Telegram/SourceFiles/platform/win/window_title_win.cpp b/Telegram/SourceFiles/platform/win/window_title_win.cpp
index e542e965d0..a27c96f5d8 100644
--- a/Telegram/SourceFiles/platform/win/window_title_win.cpp
+++ b/Telegram/SourceFiles/platform/win/window_title_win.cpp
@@ -31,8 +31,8 @@ TitleWidget::TitleWidget(QWidget *parent) : Window::TitleWidget(parent)
 , _minimize(this, st::titleButtonMinimize)
 , _maximizeRestore(this, st::titleButtonMaximize)
 , _close(this, st::titleButtonClose)
-, _maximized(parent->window()->windowState() & Qt::WindowMaximized)
-, _shadow(this, st::titleShadow) {
+, _shadow(this, st::titleShadow)
+, _maximized(parent->window()->windowState() & Qt::WindowMaximized) {
 	_minimize->setClickedCallback([this]() {
 		window()->setWindowState(Qt::WindowMinimized);
 		_minimize->clearState();