diff --git a/client/SDL/aad/wrapper/webview.h b/client/SDL/aad/wrapper/webview.h
index c201baf37..19e07e8ef 100644
--- a/client/SDL/aad/wrapper/webview.h
+++ b/client/SDL/aad/wrapper/webview.h
@@ -785,7 +785,7 @@ namespace webview
 			GtkWidget* m_webview;
 
 			void* navigateCallbackArg = nullptr;
-			std::function<void(const std::string&, void*)> navigateCallback = 0;
+			std::function<void(const std::string&, void*)> navigateCallback = nullptr;
 
 			static void on_load_changed(WebKitWebView* web_view, WebKitLoadEvent load_event,
 			                            gpointer arg)
@@ -2666,7 +2666,7 @@ namespace webview
 		}
 
 	  private:
-		void on_message(const std::string& msg)
+		void on_message(const std::string& msg) override
 		{
 			auto seq = detail::json_parse(msg, "id", 0);
 			auto name = detail::json_parse(msg, "method", 0);
diff --git a/client/SDL/dialogs/sdl_button.hpp b/client/SDL/dialogs/sdl_button.hpp
index 384b28251..e96bce955 100644
--- a/client/SDL/dialogs/sdl_button.hpp
+++ b/client/SDL/dialogs/sdl_button.hpp
@@ -9,7 +9,7 @@ class SdlButton : public SdlWidget
   public:
 	SdlButton(SDL_Renderer* renderer, const std::string& label, int id, const SDL_Rect& rect);
 	SdlButton(SdlButton&& other) noexcept;
-	virtual ~SdlButton();
+	virtual ~SdlButton() override;
 
 	bool highlight(SDL_Renderer* renderer);
 	bool update(SDL_Renderer* renderer);
diff --git a/client/SDL/dialogs/sdl_buttons.cpp b/client/SDL/dialogs/sdl_buttons.cpp
index f501a0967..124ab72bb 100644
--- a/client/SDL/dialogs/sdl_buttons.cpp
+++ b/client/SDL/dialogs/sdl_buttons.cpp
@@ -2,7 +2,6 @@
 
 #include "sdl_buttons.hpp"
 
-static const Uint32 vpadding = 5;
 static const Uint32 hpadding = 10;
 
 SdlButtonList::SdlButtonList()
diff --git a/client/SDL/dialogs/sdl_input_widgets.cpp b/client/SDL/dialogs/sdl_input_widgets.cpp
index 3d5ae1c09..7525c051e 100644
--- a/client/SDL/dialogs/sdl_input_widgets.cpp
+++ b/client/SDL/dialogs/sdl_input_widgets.cpp
@@ -4,7 +4,6 @@
 #include "sdl_input_widgets.hpp"
 
 static const Uint32 vpadding = 5;
-static const Uint32 hpadding = 10;
 
 SdlInputWidgetList::SdlInputWidgetList(const std::string& title,
                                        const std::vector<std::string>& labels,
diff --git a/client/SDL/dialogs/sdl_select.hpp b/client/SDL/dialogs/sdl_select.hpp
index 4690e4441..f16c2f016 100644
--- a/client/SDL/dialogs/sdl_select.hpp
+++ b/client/SDL/dialogs/sdl_select.hpp
@@ -30,7 +30,7 @@ class SdlSelectWidget : public SdlWidget
   public:
 	SdlSelectWidget(SDL_Renderer* renderer, const std::string& label, const SDL_Rect& rect);
 	SdlSelectWidget(SdlSelectWidget&& other) noexcept;
-	virtual ~SdlSelectWidget();
+	virtual ~SdlSelectWidget() override;
 
 	bool set_mouseover(SDL_Renderer* renderer, bool mouseOver);
 	bool set_highlight(SDL_Renderer* renderer, bool highlight);
diff --git a/client/SDL/dialogs/sdl_selectlist.cpp b/client/SDL/dialogs/sdl_selectlist.cpp
index e54c99054..16325a35b 100644
--- a/client/SDL/dialogs/sdl_selectlist.cpp
+++ b/client/SDL/dialogs/sdl_selectlist.cpp
@@ -1,7 +1,6 @@
 #include "sdl_selectlist.hpp"
 
 static const Uint32 vpadding = 5;
-static const Uint32 hpadding = 10;
 
 SdlSelectList::SdlSelectList(const std::string& title, const std::vector<std::string>& labels)
     : _window(nullptr), _renderer(nullptr)
diff --git a/client/SDL/dialogs/sdl_widget.cpp b/client/SDL/dialogs/sdl_widget.cpp
index 731956e3e..c34ccdcf8 100644
--- a/client/SDL/dialogs/sdl_widget.cpp
+++ b/client/SDL/dialogs/sdl_widget.cpp
@@ -35,7 +35,6 @@
 
 static const SDL_Color backgroundcolor = { 0x38, 0x36, 0x35, 0xff };
 
-static const Uint32 vpadding = 5;
 static const Uint32 hpadding = 10;
 
 SdlWidget::SdlWidget(SDL_Renderer* renderer, const SDL_Rect& rect, bool input)
diff --git a/client/SDL/sdl_freerdp.cpp b/client/SDL/sdl_freerdp.cpp
index fd27ac955..3c026b8cf 100644
--- a/client/SDL/sdl_freerdp.cpp
+++ b/client/SDL/sdl_freerdp.cpp
@@ -852,7 +852,7 @@ static int sdl_run(SdlContext* sdl)
 
 					Uint32 curFlags = SDL_GetWindowFlags(window);
 
-					if (windowEvent.user.code != 0 ? SDL_TRUE : SDL_FALSE)
+					if (enter)
 					{
 						if (!(curFlags & SDL_WINDOW_BORDERLESS))
 						{
diff --git a/client/SDL/sdl_pointer.cpp b/client/SDL/sdl_pointer.cpp
index 48d52b969..a99f7e3ec 100644
--- a/client/SDL/sdl_pointer.cpp
+++ b/client/SDL/sdl_pointer.cpp
@@ -183,10 +183,10 @@ static BOOL sdl_Pointer_SetPosition(rdpContext* context, UINT32 x, UINT32 y)
 
 BOOL sdl_register_pointer(rdpGraphics* graphics)
 {
-	const rdpPointer pointer = { sizeof(sdlPointer),     sdl_Pointer_New,
-		                         sdl_Pointer_Free,       sdl_Pointer_Set,
-		                         sdl_Pointer_SetNull,    sdl_Pointer_SetDefault,
-		                         sdl_Pointer_SetPosition };
+	const rdpPointer pointer = { sizeof(sdlPointer),      sdl_Pointer_New,
+		                         sdl_Pointer_Free,        sdl_Pointer_Set,
+		                         sdl_Pointer_SetNull,     sdl_Pointer_SetDefault,
+		                         sdl_Pointer_SetPosition, 0 };
 	graphics_register_pointer(graphics, &pointer);
 	return TRUE;
 }