diff --git a/rpcs3/basic_keyboard_handler.h b/rpcs3/basic_keyboard_handler.h
index e86f293384..58dd0eaebe 100644
--- a/rpcs3/basic_keyboard_handler.h
+++ b/rpcs3/basic_keyboard_handler.h
@@ -15,7 +15,7 @@ public:
 	explicit basic_keyboard_handler();
 
 	void SetTargetWindow(QWindow* target);
-	bool eventFilter(QObject* obj, QEvent* ev);
+	bool eventFilter(QObject* obj, QEvent* ev) override;
 	void keyPressEvent(QKeyEvent* event);
 	void keyReleaseEvent(QKeyEvent* event);
 	void LoadSettings();
diff --git a/rpcs3/basic_mouse_handler.h b/rpcs3/basic_mouse_handler.h
index 7caea23c23..364346e8d9 100644
--- a/rpcs3/basic_mouse_handler.h
+++ b/rpcs3/basic_mouse_handler.h
@@ -21,7 +21,7 @@ public:
 	void MouseScroll(QWheelEvent* event);
 	void MouseMove(QMouseEvent* event);
 
-	bool eventFilter(QObject* obj, QEvent* ev);
+	bool eventFilter(QObject* obj, QEvent* ev) override;
 private:
 	QWindow* m_target = nullptr;
 };
diff --git a/rpcs3/keyboard_pad_handler.h b/rpcs3/keyboard_pad_handler.h
index a94d215aa2..e4a78d5b5e 100644
--- a/rpcs3/keyboard_pad_handler.h
+++ b/rpcs3/keyboard_pad_handler.h
@@ -65,7 +65,7 @@ public:
 	void keyReleaseEvent(QKeyEvent* event);
 	void LoadSettings();
 
-	bool eventFilter(QObject* obj, QEvent* ev);
+	bool eventFilter(QObject* obj, QEvent* ev) override;
 private:
 	QWindow* m_target = nullptr;
 };
diff --git a/rpcs3/rpcs3qt/instruction_editor_dialog.cpp b/rpcs3/rpcs3qt/instruction_editor_dialog.cpp
index 3638fa7d7b..9757c233bd 100644
--- a/rpcs3/rpcs3qt/instruction_editor_dialog.cpp
+++ b/rpcs3/rpcs3qt/instruction_editor_dialog.cpp
@@ -84,7 +84,8 @@ instruction_editor_dialog::instruction_editor_dialog(QWidget *parent, u32 _pc, c
 void instruction_editor_dialog::updatePreview()
 {
 	bool ok;
-	//ulong opcode = t2_instr->text().toULong(&ok, 16);
+	ulong opcode = t2_instr->text().toULong(&ok, 16);
+	Q_UNUSED(opcode);
 
 	if (ok)
 	{
diff --git a/rpcs3/rpcs3qt/settings_dialog.cpp b/rpcs3/rpcs3qt/settings_dialog.cpp
index bfb1415690..c52a075785 100644
--- a/rpcs3/rpcs3qt/settings_dialog.cpp
+++ b/rpcs3/rpcs3qt/settings_dialog.cpp
@@ -103,7 +103,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> xSettings, const
 	//     _____ _____  _    _   _______    _     
 	//    / ____|  __ \| |  | | |__   __|  | |    
 	//   | |    | |__) | |  | |    | | __ _| |__  
-	//   | |    |  ___/| |  | |    | |/ _` | '_ \ 
+	//   | |    |  ___/| |  | |    | |/ _` | '_ \
 	//   | |____| |    | |__| |    | | (_| | |_) |
 	//    \_____|_|     \____/     |_|\__,_|_.__/ 
 
@@ -366,7 +366,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> xSettings, const
 	//     _____ _____  _    _   _______    _     
 	//    / ____|  __ \| |  | | |__   __|  | |    
 	//   | |  __| |__) | |  | |    | | __ _| |__  
-	//   | | |_ |  ___/| |  | |    | |/ _` | '_ \ 
+	//   | | |_ |  ___/| |  | |    | |/ _` | '_ \
 	//   | |__| | |    | |__| |    | | (_| | |_) |
 	//    \_____|_|     \____/     |_|\__,_|_.__/ 
 
@@ -586,7 +586,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> xSettings, const
 	//                      _ _         _______    _     
 	//       /\            | (_)       |__   __|  | |    
 	//      /  \  _   _  __| |_  ___      | | __ _| |__  
-	//     / /\ \| | | |/ _` | |/ _ \     | |/ _` | '_ \ 
+	//     / /\ \| | | |/ _` | |/ _ \     | |/ _` | '_ \
 	//    / ____ \ |_| | (_| | | (_) |    | | (_| | |_) |
 	//   /_/    \_\__,_|\__,_|_|\___/     |_|\__,_|_.__/ 
 
@@ -609,7 +609,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> xSettings, const
 	//    _____       __   ____    _______    _     
 	//   |_   _|     / /  / __ \  |__   __|  | |    
 	//     | |      / /  | |  | |    | | __ _| |__  
-	//     | |     / /   | |  | |    | |/ _` | '_ \ 
+	//     | |     / /   | |  | |    | |/ _` | '_ \
 	//    _| |_   / /    | |__| |    | | (_| | |_) |
 	//   |_____| /_/      \____/     |_|\__,_|_.__/ 
 
@@ -633,7 +633,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> xSettings, const
 	//     _____           _                   _______    _     
 	//    / ____|         | |                 |__   __|  | |    
 	//   | (___  _   _ ___| |_ ___ _ __ ___      | | __ _| |__  
-	//    \___ \| | | / __| __/ _ \ '_ ` _ \     | |/ _` | '_ \ 
+	//    \___ \| | | / __| __/ _ \ '_ ` _ \     | |/ _` | '_ \
 	//    ____) | |_| \__ \ ||  __/ | | | | |    | | (_| | |_) |
 	//   |_____/ \__, |___/\__\___|_| |_| |_|    |_|\__,_|_.__/ 
 	//            __/ |                                         
@@ -652,7 +652,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> xSettings, const
 	//    _   _      _                      _      _______    _     
 	//   | \ | |    | |                    | |    |__   __|  | |    
 	//   |  \| | ___| |___      _____  _ __| | __    | | __ _| |__  
-	//   | . ` |/ _ \ __\ \ /\ / / _ \| '__| |/ /    | |/ _` | '_ \ 
+	//   | . ` |/ _ \ __\ \ /\ / / _ \| '__| |/ /    | |/ _` | '_ \
 	//   | |\  |  __/ |_ \ V  V / (_) | |  |   <     | | (_| | |_) |
 	//   |_| \_|\___|\__| \_/\_/ \___/|_|  |_|\_\    |_|\__,_|_.__/ 
 
@@ -664,7 +664,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> xSettings, const
 	//    ______                 _       _               _______    _     
 	//   |  ____|               | |     | |             |__   __|  | |    
 	//   | |__   _ __ ___  _   _| | __ _| |_ ___  _ __     | | __ _| |__  
-	//   |  __| | '_ ` _ \| | | | |/ _` | __/ _ \| '__|    | |/ _` | '_ \ 
+	//   |  __| | '_ ` _ \| | | | |/ _` | __/ _ \| '__|    | |/ _` | '_ \
 	//   | |____| | | | | | |_| | | (_| | || (_) | |       | | (_| | |_) |
 	//   |______|_| |_| |_|\__,_|_|\__,_|\__\___/|_|       |_|\__,_|_.__/ 
 
@@ -822,7 +822,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> xSettings, const
 	//    _____       _                   _______    _     
 	//   |  __ \     | |                 |__   __|  | |    
 	//   | |  | | ___| |__  _   _  __ _     | | __ _| |__  
-	//   | |  | |/ _ \ '_ \| | | |/ _` |    | |/ _` | '_ \ 
+	//   | |  | |/ _ \ '_ \| | | |/ _` |    | |/ _` | '_ \
 	//   | |__| |  __/ |_) | |_| | (_| |    | | (_| | |_) |
 	//   |_____/ \___|_.__/ \__,_|\__, |    |_|\__,_|_.__/ 
 	//                             __/ |