diff --git a/rpcs3/keyboard_pad_handler.h b/rpcs3/keyboard_pad_handler.h
index ca2e86215b..295ab82c59 100644
--- a/rpcs3/keyboard_pad_handler.h
+++ b/rpcs3/keyboard_pad_handler.h
@@ -71,7 +71,7 @@ public:
 
 	void init_config(pad_config* cfg, const std::string& name) override;
 	std::vector<std::string> ListDevices() override;
-	void get_next_button_press(const std::string& padId, const std::function<void(u16, std::string, std::string, std::array<int, 6>)>& callback, const std::function<void(std::string)>& fail_callback, bool get_blacklist = false, const std::vector<std::string>& buttons = {}) override {};
+	void get_next_button_press(const std::string& /*padId*/, const std::function<void(u16, std::string, std::string, std::array<int, 6>)>& /*callback*/, const std::function<void(std::string)>& /*fail_callback*/, bool /*get_blacklist*/ = false, const std::vector<std::string>& /*buttons*/ = {}) override {};
 	bool bindPadToDevice(std::shared_ptr<Pad> pad, const std::string& device) override;
 	void ThreadProc() override;
 
diff --git a/rpcs3/mm_joystick_handler.cpp b/rpcs3/mm_joystick_handler.cpp
index 66ec3b158d..1c6328d6ff 100644
--- a/rpcs3/mm_joystick_handler.cpp
+++ b/rpcs3/mm_joystick_handler.cpp
@@ -145,31 +145,31 @@ std::array<u32, PadHandlerBase::button::button_count> mm_joystick_handler::get_m
 	joy_device->axis_right[2] = find_key(profile->rs_down);
 	joy_device->axis_right[3] = find_key(profile->rs_up);
 
-	mapping[button::up]       = find_key(profile->up);
-	mapping[button::down]     = find_key(profile->down);
-	mapping[button::left]     = find_key(profile->left);
-	mapping[button::right]    = find_key(profile->right);
-	mapping[button::cross]    = find_key(profile->cross);
-	mapping[button::square]   = find_key(profile->square);
-	mapping[button::circle]   = find_key(profile->circle);
-	mapping[button::triangle] = find_key(profile->triangle);
-	mapping[button::l1]       = find_key(profile->l1);
-	mapping[button::l2]       = (u32)joy_device->trigger_left;
-	mapping[button::l3]       = find_key(profile->l3);
-	mapping[button::r1]       = find_key(profile->r1);
-	mapping[button::r2]       = (u32)joy_device->trigger_right;
-	mapping[button::r3]       = find_key(profile->r3);
-	mapping[button::start]    = find_key(profile->start);
-	mapping[button::select]   = find_key(profile->select);
-	mapping[button::ps]       = find_key(profile->ps);
-	mapping[button::ls_left]  = joy_device->axis_left[0];
-	mapping[button::ls_right] = joy_device->axis_left[1];
-	mapping[button::ls_down]  = joy_device->axis_left[2];
-	mapping[button::ls_up]    = joy_device->axis_left[3];
-	mapping[button::rs_left]  = joy_device->axis_right[0];
-	mapping[button::rs_right] = joy_device->axis_right[1];
-	mapping[button::rs_down]  = joy_device->axis_right[2];
-	mapping[button::rs_up]    = joy_device->axis_right[3];
+	mapping[button::up]       = static_cast<u32>(find_key(profile->up));
+	mapping[button::down]     = static_cast<u32>(find_key(profile->down));
+	mapping[button::left]     = static_cast<u32>(find_key(profile->left));
+	mapping[button::right]    = static_cast<u32>(find_key(profile->right));
+	mapping[button::cross]    = static_cast<u32>(find_key(profile->cross));
+	mapping[button::square]   = static_cast<u32>(find_key(profile->square));
+	mapping[button::circle]   = static_cast<u32>(find_key(profile->circle));
+	mapping[button::triangle] = static_cast<u32>(find_key(profile->triangle));
+	mapping[button::l1]       = static_cast<u32>(find_key(profile->l1));
+	mapping[button::l2]       = static_cast<u32>(joy_device->trigger_left);
+	mapping[button::l3]       = static_cast<u32>(find_key(profile->l3));
+	mapping[button::r1]       = static_cast<u32>(find_key(profile->r1));
+	mapping[button::r2]       = static_cast<u32>(joy_device->trigger_right);
+	mapping[button::r3]       = static_cast<u32>(find_key(profile->r3));
+	mapping[button::start]    = static_cast<u32>(find_key(profile->start));
+	mapping[button::select]   = static_cast<u32>(find_key(profile->select));
+	mapping[button::ps]       = static_cast<u32>(find_key(profile->ps));
+	mapping[button::ls_left]  = static_cast<u32>(joy_device->axis_left[0]);
+	mapping[button::ls_right] = static_cast<u32>(joy_device->axis_left[1]);
+	mapping[button::ls_down]  = static_cast<u32>(joy_device->axis_left[2]);
+	mapping[button::ls_up]    = static_cast<u32>(joy_device->axis_left[3]);
+	mapping[button::rs_left]  = static_cast<u32>(joy_device->axis_right[0]);
+	mapping[button::rs_right] = static_cast<u32>(joy_device->axis_right[1]);
+	mapping[button::rs_down]  = static_cast<u32>(joy_device->axis_right[2]);
+	mapping[button::rs_up]    = static_cast<u32>(joy_device->axis_right[3]);
 
 	return mapping;
 }