diff --git a/app/wm/tracker/schemes.h b/app/wm/tracker/schemes.h
index ca9d69066..dfe8da591 100644
--- a/app/wm/tracker/schemes.h
+++ b/app/wm/tracker/schemes.h
@@ -53,7 +53,7 @@ private:
      QMap<QString, Latte::WindowSystem::SchemeColors *> m_schemes;
 
      //! window id and its corresponding scheme file
-     QMap<WindowId, QString> m_windowScheme;
+     QHash<WindowId, QString> m_windowScheme;
 };
 
 }
diff --git a/app/wm/tracker/windowstracker.cpp b/app/wm/tracker/windowstracker.cpp
index f2d678c92..15cad68e4 100644
--- a/app/wm/tracker/windowstracker.cpp
+++ b/app/wm/tracker/windowstracker.cpp
@@ -809,7 +809,7 @@ void Windows::cleanupFaultyWindows()
         auto winfo = m_windows[key];
 
         //! garbage windows removing
-        if (winfo.wid()<=0 || winfo.geometry() == QRect(0, 0, 0, 0)) {
+        if (winfo.wid().toInt()<=0 || winfo.geometry() == QRect(0, 0, 0, 0)) {
             //qDebug() << "Faulty Geometry ::: " << winfo.wid();
             m_windows.remove(key);
         }
@@ -925,7 +925,7 @@ void Windows::updateHints(Latte::View *view)
             break;
         }
 
-        if (!existsFaultyWindow && (winfo.wid()<=0 || winfo.geometry() == QRect(0, 0, 0, 0))) {
+        if (!existsFaultyWindow && (winfo.wid().toInt()<=0 || winfo.geometry() == QRect(0, 0, 0, 0))) {
             existsFaultyWindow = true;
         }
 
@@ -1095,7 +1095,7 @@ void Windows::updateHints(Latte::Layout::GenericLayout *layout) {
             break;
         }
 
-        if (!existsFaultyWindow && (winfo.wid()<=0 || winfo.geometry() == QRect(0, 0, 0, 0))) {
+        if (!existsFaultyWindow && (winfo.wid().toInt()<=0 || winfo.geometry() == QRect(0, 0, 0, 0))) {
             existsFaultyWindow = true;
         }
 
diff --git a/app/wm/tracker/windowstracker.h b/app/wm/tracker/windowstracker.h
index f3cf10cf1..0b4b16794 100644
--- a/app/wm/tracker/windowstracker.h
+++ b/app/wm/tracker/windowstracker.h
@@ -181,7 +181,7 @@ private:
         Latte::Types::SidebarAutoHide
     };
 
-    QMap<WindowId, WindowInfoWrap> m_windows;
+    QHash<WindowId, WindowInfoWrap> m_windows;
 
     QTimer m_updateAllHintsTimer;
     //! Some applications delay their application name/icon identification