diff --git a/src/Definitions.h b/src/Definitions.h
index c3cb36b..ac318ab 100644
--- a/src/Definitions.h
+++ b/src/Definitions.h
@@ -7,10 +7,6 @@
 #define tsclientmusic std::shared_ptr<ts::server::MusicClient>
 
 namespace ts {
-    constexpr static auto kMaxPokeMessageLength = 100;
-    constexpr static auto kMaxRequestTalkPowerMessageLength = 50;
-    constexpr static auto kMaxAfkMessageLength = 256;
-
     typedef uint16_t ServerId;
     typedef int32_t OptionalServerId;
     constexpr auto EmptyServerId = (OptionalServerId) -1;
diff --git a/src/PermissionManager.cpp b/src/PermissionManager.cpp
index fa1a147..e1e099c 100644
--- a/src/PermissionManager.cpp
+++ b/src/PermissionManager.cpp
@@ -968,6 +968,9 @@ inline std::deque<std::string> map_entry(std::string key, teamspeak::GroupType t
             result.insert(result.end(), mapped_general.begin(), mapped_general.end());
         }
 
+        if(result.empty())
+            result.push_back("x_" + key);
+
         for(auto& entry : result)
             entry = "i_needed_modify_power_" + entry.substr(2);
         return result;