diff --git a/src/blackcore/inputmanager.cpp b/src/blackcore/inputmanager.cpp
index f5c45215f..9d6bf9422 100644
--- a/src/blackcore/inputmanager.cpp
+++ b/src/blackcore/inputmanager.cpp
@@ -83,7 +83,7 @@ namespace BlackCore
 
     void CInputManager::processButtonCombinationChanged(const CHotkeyCombination &combination)
     {
-        // Merge in the keyboard keys
+        // Merge in the keyboard dkeys
         CHotkeyCombination copy(combination);
         copy.setKeyboardKeys(m_lastCombination.getKeyboardKeys());
         processCombination(copy);
@@ -124,7 +124,7 @@ namespace BlackCore
     {
         m_keyboard = IKeyboard::create(this);
         m_joystick = IJoystick::create(this);
-        connect(m_keyboard.get(), &IKeyboard::keyCombinationChanged, this, &CInputManager::processKeyCombinationChanged, Qt::QueuedConnection);
+        connect(m_keyboard.get(), &IKeyboard::keyCombinationChanged,    this, &CInputManager::processKeyCombinationChanged, Qt::QueuedConnection);
         connect(m_joystick.get(), &IJoystick::buttonCombinationChanged, this, &CInputManager::processButtonCombinationChanged, Qt::QueuedConnection);
     }
 
diff --git a/src/blackgui/components/hotkeydialog.cpp b/src/blackgui/components/hotkeydialog.cpp
index efbec6a86..c860bd4ad 100644
--- a/src/blackgui/components/hotkeydialog.cpp
+++ b/src/blackgui/components/hotkeydialog.cpp
@@ -104,10 +104,10 @@ namespace BlackGui
                 ui->cb_Identifier->setCurrentIndex(index);
             }
 
-            connect(ui->pb_AdvancedMode, &QPushButton::clicked, this, &CHotkeyDialog::advancedModeChanged);
+            connect(ui->pb_AdvancedMode,   &QPushButton::clicked, this, &CHotkeyDialog::advancedModeChanged);
             connect(ui->pb_SelectedHotkey, &QPushButton::clicked, this, &CHotkeyDialog::captureHotkey);
-            connect(ui->pb_Accept, &QPushButton::clicked, this, &CHotkeyDialog::accept);
-            connect(ui->pb_Cancel, &QPushButton::clicked, this, &CHotkeyDialog::reject);
+            connect(ui->pb_Accept,         &QPushButton::clicked, this, &CHotkeyDialog::accept);
+            connect(ui->pb_Cancel,         &QPushButton::clicked, this, &CHotkeyDialog::reject);
             connect(ui->tv_Actions->selectionModel(), &QItemSelectionModel::selectionChanged, this, &CHotkeyDialog::changeSelectedAction);
             connect(ui->cb_Identifier, qOverload<int>(&QComboBox::currentIndexChanged), this, &CHotkeyDialog::changeApplicableMachine);
 
diff --git a/src/blackinput/win/keyboardwindows.cpp b/src/blackinput/win/keyboardwindows.cpp
index 970b4f42d..f8e96348d 100644
--- a/src/blackinput/win/keyboardwindows.cpp
+++ b/src/blackinput/win/keyboardwindows.cpp
@@ -117,16 +117,16 @@ namespace BlackInput
 
     void CKeyboardWindows::processKeyEvent(DWORD vkcode, WPARAM event)
     {
-        BlackMisc::Input::CHotkeyCombination oldCombination(m_keyCombination);
+        CHotkeyCombination oldCombination(m_keyCombination);
         if ((event == WM_KEYDOWN) || (event == WM_SYSKEYDOWN))
         {
-            auto key = keyMapping().value(vkcode);
+            auto key = keyMapping().value(static_cast<int>(vkcode));
             if (key == Key_Unknown) { return; }
             m_keyCombination.addKeyboardKey(CKeyboardKey(key));
         }
         else if ((event == WM_KEYUP) || (event == WM_SYSKEYUP))
         {
-            auto key = keyMapping().value(vkcode);
+            auto key = keyMapping().value(static_cast<int>(vkcode));
             if (key == Key_Unknown) { return; }
             m_keyCombination.removeKeyboardKey(CKeyboardKey(key));
         }
@@ -139,7 +139,7 @@ namespace BlackInput
 
     void CKeyboardWindows::pollKeyboardState()
     {
-        BlackMisc::Input::CHotkeyCombination oldCombination(m_keyCombination);
+        CHotkeyCombination oldCombination(m_keyCombination);
         QList<int> vkeys = keyMapping().keys();
         for (int vkey : vkeys)
         {