diff --git a/cms/front_content.php b/cms/front_content.php
index d9686b8..93e81b9 100644
--- a/cms/front_content.php
+++ b/cms/front_content.php
@@ -251,7 +251,7 @@ $errsite = 'Location: ' . Contenido_Url::getInstance()->buildRedirect($aParams);
  * Note: These variables can be set via http globals e.g. front_content.php?idcat=41&idart=34&idcatart=35&idartlang=42
  * If not the values will be computed.
  */
-if ($idart && !$idcat && !$idcatart) {
+if (!empty($idart) && empty($idcat) && empty($idcatart)) {
     /* Try to fetch the first idcat */
     $sql = "SELECT idcat FROM " . $cfg["tab"]["cat_art"] . " WHERE idart = '" . Contenido_Security::toInteger($idart) . "'";
     $db->query($sql);
@@ -420,7 +420,7 @@ if ($cfg["cache"]["disable"] != '1') {
  * The reason is to avoid cross-site scripting errors in the backend, if the backend domain differs from
  * the frontend domain.
  */
-if ($contenido) {
+if (isset($contenido)) {
     $perm->load_permissions();
 
     /* Change mode edit / view */
@@ -536,7 +536,7 @@ if (empty($inUse) && (isset($allow) && $allow == true) && $view == "edit" && ($p
 ##############################################
 
     /* Mark submenuitem 'Preview' in the Contenido Backend (Area: Contenido --> Articles --> Preview) */
-    if ($contenido) {
+    if (isset($contenido)) {
         $markscript = markSubMenuItem(4, true);
     }
 
diff --git a/conlite/classes/contenido/class.module.php b/conlite/classes/contenido/class.module.php
index 79f9009..5a58cf7 100644
--- a/conlite/classes/contenido/class.module.php
+++ b/conlite/classes/contenido/class.module.php
@@ -145,7 +145,7 @@ class cApiModule extends Item {
             }
         }
 
-        $oClient = new cApiClient($client);
+        $oClient = new cApiClient(cRegistry::getClientId());
         $aClientProp = $oClient->getPropertiesByType('modfileedit');
         if (count($aClientProp) > 0) {
             $this->_aModFileEditConf = array_merge($this->_aModFileEditConf, $aClientProp);
diff --git a/conlite/includes/functions.includePluginConf.php b/conlite/includes/functions.includePluginConf.php
index 4ed03e9..cbfb20b 100644
--- a/conlite/includes/functions.includePluginConf.php
+++ b/conlite/includes/functions.includePluginConf.php
@@ -80,7 +80,7 @@ $ipc_conpluginpath = cRegistry::getPluginsPath();
  * 
  * @deprecated since version 2.0
  */
-if ($contenido) {
+if (isset($contenido)) {
     $lastscantime = getSystemProperty("system", "plugin-lastscantime");
 
     /* Clean up: Fetch and trim the plugin order */