diff --git a/src/plasma/CMakeLists.txt b/src/plasma/CMakeLists.txt
index 832b7d08e..ca806b11b 100644
--- a/src/plasma/CMakeLists.txt
+++ b/src/plasma/CMakeLists.txt
@@ -136,22 +136,20 @@ kconfig_add_kcfg_files(plasma_LIB_SRCS data/kconfigxt/libplasma-theme-global.kcf
 #)
 
 
-kde4_add_library(plasma SHARED ${plasma_LIB_SRCS})
+add_library(plasma SHARED ${plasma_LIB_SRCS})
 
 target_link_libraries(plasma
-    ${QT_QTUITOOLS_LIBRARY}
-    ${QT_QTNETWORK_LIBRARY} ${QT_QTSQL_LIBRARY}
+    ${QT_QTNETWORK_LIBRARY}
+    ${QT_QTSQL_LIBRARY}
     ${Qt5Quick_LIBRARIES}
-    ${KDE4_KDEUI_LIBS}
     ${ThreadWeaver_LIBRARIES}
     ${KAuth_LIBRARIES}
     ${KWindowSystem_LIBRARIES}
     ${PLASMA_EXTRA_LIBS}
     KF5::KI18n
-    ${KDE4Support_LIBRARIES}
-    KF5::KDE4Attic
+    ${KDE4Support_LIBRARIES} # needed for KStandardDirs and KGlobal
 )
-#FIXME gpgme++ is in kdepimlibs, neeeds to be elsewhere
+#FIXME gpgme++ is in kdepimlibs, needs to be elsewhere
 target_link_libraries(plasma kdeclarative ${KArchive_LIBRARIES})
 
 if(X11_FOUND)
diff --git a/src/platformstatus/CMakeLists.txt b/src/platformstatus/CMakeLists.txt
index 2817868de..27d595141 100644
--- a/src/platformstatus/CMakeLists.txt
+++ b/src/platformstatus/CMakeLists.txt
@@ -11,11 +11,13 @@ qt4_add_dbus_adaptor (
    platformstatus.h PlatformStatus
    )
 
-kde4_add_plugin( kded_platformstatus ${kded_platformstatus_SRCS} )
+add_library(kded_platformstatus MODULE ${kded_platformstatus_SRCS} )
+set_target_properties(kded_platformstatus PROPERTIES PREFIX "")
 
 target_link_libraries(
    kded_platformstatus
-   ${KDE4_KDECORE_LIBS}
+   ${KCore_LIBRARIES}
+   ${KService_LIBRARIES}
    ${KCoreAddons_LIBRARIES}
    ${KDBusAddons_LIBRARIES}
    Qt5::DBus
diff --git a/src/scriptengines/qml/CMakeLists.txt b/src/scriptengines/qml/CMakeLists.txt
index 728771b34..46cff8792 100644
--- a/src/scriptengines/qml/CMakeLists.txt
+++ b/src/scriptengines/qml/CMakeLists.txt
@@ -23,15 +23,18 @@ set(declarative_appletscript_SRCS
 
 include_directories(${PHONON_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/common)
 
-kde4_add_plugin(plasma_appletscript_declarative ${declarative_appletscript_SRCS})
+add_library(plasma_appletscript_declarative MODULE ${declarative_appletscript_SRCS} )
+set_target_properties(plasma_appletscript_declarative PROPERTIES PREFIX "")
+
 target_link_libraries(plasma_appletscript_declarative
     ${KDE4_KIO_LIBS}
     ${KDE4Support_LIBRARIES}
+    ${KDE4Attic_LIBRARIES}
     ${QT_QTSCRIPT_LIBRARY}
     ${Qt5Quick_LIBRARIES}
     ${Qt5Qml_LIBRARIES}
     ${QT_QTUITOOLS_LIBRARY}
-    ${KDE4_KDECORE_LIBS}
+    ${KCore_LIBRARIES}
     plasma
     kdeclarative
 )
diff --git a/src/shell/widgetexplorer/widgetexplorer.cpp b/src/shell/widgetexplorer/widgetexplorer.cpp
index 93ca8b74d..e576ae37b 100644
--- a/src/shell/widgetexplorer/widgetexplorer.cpp
+++ b/src/shell/widgetexplorer/widgetexplorer.cpp
@@ -320,7 +320,11 @@ void WidgetExplorerPrivate::initRunningApplets()
         // QObject::connect(containment, &Containment::appletRemoved, q, &WidgetExplorerPrivate::appletRemoved);
 
         foreach (Applet *applet, containment->applets()) {
-            runningApplets[applet->pluginInfo().pluginName()]++;
+            if (applet->pluginInfo().isValid()) {
+                runningApplets[applet->pluginInfo().pluginName()]++;
+            } else {
+                qDebug() << "Invalid plugininfo. :(";
+            }
         }
     }