diff --git a/irr/include/IrrlichtDevice.h b/irr/include/IrrlichtDevice.h
index faaa5223f9eae..8a26b7a8088d5 100644
--- a/irr/include/IrrlichtDevice.h
+++ b/irr/include/IrrlichtDevice.h
@@ -369,7 +369,7 @@ class IrrlichtDevice : public virtual IReferenceCounted
 	// TODO: This is just some boilerplate for non-SDL devices. Remove this once we fully switch to SDL.
 	void fillScancode(SEvent &irrevent)
 	{
-		const auto &keyinput = irrevent.KeyInput;
+		auto &keyinput = irrevent.KeyInput;
 		keyinput.SystemKeyCode = getScancodeFromKey(KeyCode(keyinput.Key, keyinput.Char));
 	}
 };
diff --git a/src/gui/guiKeyChangeMenu.cpp b/src/gui/guiKeyChangeMenu.cpp
index dc0580b32217b..cd2de25dae9a7 100644
--- a/src/gui/guiKeyChangeMenu.cpp
+++ b/src/gui/guiKeyChangeMenu.cpp
@@ -255,7 +255,7 @@ bool GUIKeyChangeMenu::acceptInput()
 	{
 		const auto *e = getElementFromId(GUI_ID_SAVE_AS_SCANCODES);
 		if(e && e->getType() == gui::EGUIET_CHECK_BOX) {
-			save_as_scancodes = dynamic_cast<gui::IGUICheckBox*>(e)->isChecked();
+			save_as_scancodes = dynamic_cast<const gui::IGUICheckBox*>(e)->isChecked();
 			g_settings->setBool("save_keys_as_scancodes", save_as_scancodes);
 		}
 	}