diff --git a/src/common/gsettings.c b/src/common/gsettings.c
index d495030b9..57a5480d1 100644
--- a/src/common/gsettings.c
+++ b/src/common/gsettings.c
@@ -41,12 +41,12 @@ static const char* getDConfValue(DConfData* data, const char* schemaName, const
     ffStrbufAppendC(&dconfStyleKey, '/');
     ffStrbufAppendTransformS(&dconfStyleKey, schemaName, transformGSettingsToDConf);
 
-    if(path == NULL || *path != '/')
+    if(path != NULL && *path != '/')
         ffStrbufAppendC(&dconfStyleKey, '/');
 
     ffStrbufAppendTransformS(&dconfStyleKey, path, transformGSettingsToDConf);
 
-    if(path != NULL && dconfStyleKey.chars[dconfStyleKey.length - 1] != '/')
+    if(dconfStyleKey.chars[dconfStyleKey.length - 1] != '/')
         ffStrbufAppendC(&dconfStyleKey, '/');
 
     ffStrbufAppendS(&dconfStyleKey, key);
diff --git a/src/modules/cpu.c b/src/modules/cpu.c
index 6afb0ab8a..1e8ca1a15 100644
--- a/src/modules/cpu.c
+++ b/src/modules/cpu.c
@@ -100,7 +100,7 @@ void ffPrintCPU(FFinstance* instance)
 
     const char* removeStrings[] = {
         "(R)", "(r)", "(TM)", "(tm)",
-        " CPU", " FPU", " Processor",
+        " CPU", " FPU", " APU", " Processor",
         " Dual-Core", " Quad-Core", " Six-Core", " Eight-Core", " Ten-Core",
         " 2-Core", " 4-Core", " 6-Core", " 8-Core", " 10-Core", " 12-Core", " 14-Core", " 16-Core"
     };