diff --git a/addressbook/inc/class.addressbook_hooks.inc.php b/addressbook/inc/class.addressbook_hooks.inc.php
index 426454100b..5e044641e4 100644
--- a/addressbook/inc/class.addressbook_hooks.inc.php
+++ b/addressbook/inc/class.addressbook_hooks.inc.php
@@ -359,7 +359,7 @@ class addressbook_hooks
 			'file_access_user' => true,	// file_access supports 4th parameter $user
 			'file_access'=> 'api.EGroupware\\Api\\Contacts.file_access',
 			'default_types' => array('n' => array('name' => 'contact', 'options' => array('icon' => 'navbar.png','template' => 'addressbook.edit'))),
-			// registers an addtional type 'addressbook-email', returning only contacts with email, title has email appended
+			// registers an additional type 'addressbook-email', returning only contacts with email, title has email appended
 			'additional' => array(
 				'addressbook-email' => array(
 					'query' => 'api.EGroupware\\Api\\Contacts.link_query_email',
diff --git a/admin/inc/class.admin_cmd.inc.php b/admin/inc/class.admin_cmd.inc.php
index b7003fa460..de05a4e2d2 100644
--- a/admin/inc/class.admin_cmd.inc.php
+++ b/admin/inc/class.admin_cmd.inc.php
@@ -370,7 +370,7 @@ abstract class admin_cmd
 		$vars = get_object_vars($this);	// does not work in php5.1.2 due a bug
 
 		// data is stored serialized
-		// paswords are masked / removed, if we dont need them anymore
+		// passwords are masked / removed, if we don't need them anymore
 		$vars['data'] = in_array($this->status, self::$require_pw_stati) ?
 			json_encode($this->data) : self::mask_passwords($this->data);
 
diff --git a/admin/inc/class.admin_customfields.inc.php b/admin/inc/class.admin_customfields.inc.php
index 77f9420513..e773798f3a 100644
--- a/admin/inc/class.admin_customfields.inc.php
+++ b/admin/inc/class.admin_customfields.inc.php
@@ -119,7 +119,7 @@ class admin_customfields
 			$this->fields = Api\Storage\Customfields::get($this->appname,true);
 			$this->content_types = Api\Config::get_content_types($this->appname);
 		}
-		$this->so = new Api\Storage\Base('phpgwapi','egw_customfields',null,'',true);
+		$this->so = new Api\Storage\Base('api','egw_customfields',null,'',true);
 	}
 
 	/**
@@ -156,7 +156,7 @@ class admin_customfields
 				$this->content_types = (array)Api\Link::get_registry($this->appname,'default_types');
 			}
 			// Set this now, we need to know it for updates
-			$this->content_type = $content['content_types']['types'] ? $content['content_types']['types'] : (array_key_exists(0,$this->content_types) ? $this->content_types[0] : key($this->content_types));
+			$this->content_type = $content['content_types']['types'] ?: (array_key_exists(0,$this->content_types) ? $this->content_types[0] : key($this->content_types));
 
 			// Common type changes - add, delete
 			if($content['content_types']['delete'])
@@ -717,4 +717,4 @@ class admin_customfields
 		}
 		return $total;
 	}
-}
+}
\ No newline at end of file
diff --git a/calendar/inc/class.calendar_owner_etemplate_widget.inc.php b/calendar/inc/class.calendar_owner_etemplate_widget.inc.php
index a29a85e7f7..8e3bc74d5c 100644
--- a/calendar/inc/class.calendar_owner_etemplate_widget.inc.php
+++ b/calendar/inc/class.calendar_owner_etemplate_widget.inc.php
@@ -175,7 +175,7 @@ class calendar_owner_etemplate_widget extends Etemplate\Widget\Taglist
 						 'filter' => array('account_id' => null)) +
 			$search_options;
 		$results = array();
-		$is_admin = !!($GLOBALS['egw_info']['user']['apps']['admin']);
+		$is_admin = !empty($GLOBALS['egw_info']['user']['apps']['admin']);
 		$total = 0;
 
 		// Contacts matching accounts the user does not have permission for cause