diff --git a/src/blackmisc/blackmiscfreefunctions.cpp b/src/blackmisc/blackmiscfreefunctions.cpp
index 959681bba..cbd9771b3 100644
--- a/src/blackmisc/blackmiscfreefunctions.cpp
+++ b/src/blackmisc/blackmiscfreefunctions.cpp
@@ -10,6 +10,7 @@
 #include "geoallclasses.h"
 #include "networkallclasses.h"
 #include "settingsallclasses.h"
+#include "hwallclasses.h"
 #include "valuemap.h"
 #include "statusmessagelist.h"
 #include "voiceallclasses.h"
@@ -110,6 +111,15 @@ void BlackMisc::Voice::registerMetadata()
     CVoiceRoomList::registerMetadata();
 }
 
+/*
+ * Metadata for Hardware
+ */
+void BlackMisc::Hardware::registerMetadata()
+{
+    CKeyboardKey::registerMetadata();
+    CKeyboardKeyList::registerMetadata();
+}
+
 /*
  * Metadata for Blackmisc
  */
@@ -130,6 +140,7 @@ void BlackMisc::registerMetadata()
     Network::registerMetadata();
     Settings::registerMetadata();
     Voice::registerMetadata();
+    Hardware::registerMetadata();
 }
 
 /*
@@ -184,6 +195,7 @@ int BlackMisc:: compareQVariants(const QVariant &v1, const QVariant &v2)
     switch (v1.type())
     {
     case QMetaType::QString:
+    case QMetaType::QChar:
         {
             QString s1 = v1.value<QString>();
             QString s2 = v2.value<QString>();
diff --git a/src/blackmisc/blackmiscfreefunctions.h b/src/blackmisc/blackmiscfreefunctions.h
index c335f6a5a..aee6656ce 100644
--- a/src/blackmisc/blackmiscfreefunctions.h
+++ b/src/blackmisc/blackmiscfreefunctions.h
@@ -90,7 +90,15 @@ namespace BlackMisc
     namespace Voice
     {
         /*!
-         * \brief Registe metadata for settings
+         * \brief Register metadata for voice
+         */
+        void registerMetadata();
+    }
+
+    namespace Hardware
+    {
+        /*!
+         * \brief Register metadata for Hardware
          */
         void registerMetadata();
     }
diff --git a/src/blackmisc/hwallclasses.h b/src/blackmisc/hwallclasses.h
new file mode 100644
index 000000000..8345c5d50
--- /dev/null
+++ b/src/blackmisc/hwallclasses.h
@@ -0,0 +1,11 @@
+/*  Copyright (C) 2013 VATSIM Community / contributors
+ *  This Source Code Form is subject to the terms of the Mozilla Public
+ *  License, v. 2.0. If a copy of the MPL was not distributed with this
+ *  file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef BLACKMISC_HWALLCLASSES_H
+#define BLACKMISC_HWALLCLASSES_H
+
+#include "blackmisc/hwkeyboardkeylist.h"
+
+#endif // guard