diff --git a/CMakeLists.txt b/CMakeLists.txt
index ca7c9b0e7..cb35545d3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -98,7 +98,7 @@ find_package(PkgConfig)
 if (PKG_CONFIG_FOUND)
     option(BUILD_KEYRING "Gnome keyring password plugin" ON)
     if (BUILD_KEYRING)
-        pkg_check_modules(GNOME_KEYRING gnome-keyring-1)
+        pkg_check_modules(GNOME_KEYRING IMPORTED_TARGET gnome-keyring-1 )
     endif()
 endif()
 
diff --git a/src/lib/adblock/adblockmanager.cpp b/src/lib/adblock/adblockmanager.cpp
index f88822bb3..052d3e7f9 100644
--- a/src/lib/adblock/adblockmanager.cpp
+++ b/src/lib/adblock/adblockmanager.cpp
@@ -359,7 +359,9 @@ void AdBlockManager::updateMatcher()
 {
     QMutexLocker locker(&m_mutex);
 
+    mApp->networkManager()->removeUrlInterceptor(m_interceptor);
     m_matcher->update();
+    mApp->networkManager()->installUrlInterceptor(m_interceptor);
 }
 
 void AdBlockManager::updateAllSubscriptions()
diff --git a/src/lib/webengine/webview.cpp b/src/lib/webengine/webview.cpp
index a94b5268b..1b763b78c 100644
--- a/src/lib/webengine/webview.cpp
+++ b/src/lib/webengine/webview.cpp
@@ -35,6 +35,7 @@
 #include "scripts.h"
 #include "webhittestresult.h"
 #include "webscrollbarmanager.h"
+#include "../config.h"
 
 #include <iostream>
 
diff --git a/src/plugins/GnomeKeyringPasswords/CMakeLists.txt b/src/plugins/GnomeKeyringPasswords/CMakeLists.txt
index 6dd837c29..bc27ee23e 100644
--- a/src/plugins/GnomeKeyringPasswords/CMakeLists.txt
+++ b/src/plugins/GnomeKeyringPasswords/CMakeLists.txt
@@ -14,5 +14,5 @@ qt5_add_resources(RSCS ${GnomeKeyringPasswords_RSCS})
 
 add_library(GnomeKeyringPasswords MODULE ${GnomeKeyringPasswords_SRCS} ${RSCS})
 install(TARGETS GnomeKeyringPasswords DESTINATION ${FALKON_INSTALL_PLUGINDIR})
-target_link_libraries(GnomeKeyringPasswords ${GNOME_KEYRING_LIBRARIES} FalkonPrivate)
+target_link_libraries(GnomeKeyringPasswords PkgConfig::GNOME_KEYRING FalkonPrivate)