diff --git a/api/src/Contacts.php b/api/src/Contacts.php
index e7d8ae31c3..9eb36fc0b6 100755
--- a/api/src/Contacts.php
+++ b/api/src/Contacts.php
@@ -18,6 +18,7 @@ namespace EGroupware\Api;
 
 // explicitly reference classes still in phpgwapi
 use categories;
+use etemplate;	// cats2color
 
 use calendar_bo;	// to_do: do NOT require it, just use if there
 
diff --git a/api/src/Storage/Tracking.php b/api/src/Storage/Tracking.php
index 271d590a6d..ef10275bf6 100644
--- a/api/src/Storage/Tracking.php
+++ b/api/src/Storage/Tracking.php
@@ -406,7 +406,7 @@ abstract class Tracking
 		if ($GLOBALS['egw_info']['server']['log_user_agent_action'] && ($changed_fields || !$old))
 		{
 			$this->historylog->add('user_agent_action', $data[$this->id_field],
-				$_SERVER['HTTP_USER_AGENT'], $_SESSION[Api\SessionEGW_SESSION_VAR]['session_action']);
+				$_SERVER['HTTP_USER_AGENT'], $_SESSION[Api\Session::EGW_SESSION_VAR]['session_action']);
 		}
 		foreach($changed_fields as $name)
 		{