diff --git a/ktapi/KTAPISession.inc.php b/ktapi/KTAPISession.inc.php
index 4b7805b..91f62ad 100644
--- a/ktapi/KTAPISession.inc.php
+++ b/ktapi/KTAPISession.inc.php
@@ -379,7 +379,8 @@ class KTAPI_UserSession extends KTAPI_Session
 
         if (PEAR::isError($authenticated) || $authenticated === false)
         {
-        	return new KTAPI_Error(_kt("The password is invalid."),$authenticated);
+        	$ret=new KTAPI_Error(_kt("The password is invalid."),$authenticated);
+        	return $ret;
         }
 
         if (is_null($ip))
@@ -424,7 +425,8 @@ class KTAPI_UserSession extends KTAPI_Session
 		$row = DBUtil::getOneResult($sql);
 		if (is_null($row) || PEAR::isError($row))
 		{
-			return new KTAPI_Error(KTAPI_ERROR_SESSION_INVALID, $row);
+			$ret= new KTAPI_Error(KTAPI_ERROR_SESSION_INVALID, $row);
+			return $ret;
 		}
 
 		$sessionid = $row['id'];
diff --git a/lib/authentication/builtinauthenticationprovider.inc.php b/lib/authentication/builtinauthenticationprovider.inc.php
index 73ac81c..5a1e0ab 100644
--- a/lib/authentication/builtinauthenticationprovider.inc.php
+++ b/lib/authentication/builtinauthenticationprovider.inc.php
@@ -51,7 +51,8 @@ class KTBuiltinAuthenticationProvider extends KTAuthenticationProvider {
     function &getAuthenticator($oSource) {
         // $oSource is null, since the built-in authentication provider
         // only has a single, non-registered, instance.
-        return new BuiltinAuthenticator;
+        $ret= new BuiltinAuthenticator();
+        return $ret;
     }
     
     function showUserSource($oUser, $oSource) {
diff --git a/lib/database/dbutil.inc b/lib/database/dbutil.inc
index d15f96b..0545916 100644
--- a/lib/database/dbutil.inc
+++ b/lib/database/dbutil.inc
@@ -168,7 +168,8 @@ class DBUtil {
             if ($bNoId)
                 return;
             else
-                return $db->getLastId();
+            	$ret=$db->getLastId();
+                return $ret;
         }
         if (PEAR::isError($res)) {
         	DBUtil::logQueryError(DBUtil::lastQuery($db), $res);
diff --git a/lib/ktentity.inc b/lib/ktentity.inc
index 320d02a..1dc2f3f 100644
--- a/lib/ktentity.inc
+++ b/lib/ktentity.inc
@@ -749,7 +749,7 @@ class KTEntityUtil {
             /* */
         }';
 
-        $allcode[] = sprintf('function %s ($iId, $aInfo = null) { $this->iId = $iId; $this->aFieldArr = $aInfo; $this->cacheGlobal =& $GLOBALS["_OBJECTCACHE"][%s]; }' . "\n", $sProxyClassName, $sClassName);
+        $allcode[] = sprintf('function %s ($iId, $aInfo = null) { $this->iId = $iId; $this->aFieldArr = $aInfo; $this->cacheGlobal =& $GLOBALS["_OBJECTCACHE"]["%s"]; }' . "\n", $sProxyClassName, $sClassName);
 
         $gen = sprintf("class %s extends %s {\n", $sProxyClassName, $sClassName);
         $gen .= "    " . join("\n    ", $allcode) . "\n";