diff --git a/application/forms/Config/GeneralForm.php b/application/forms/Config/GeneralForm.php
index 5bc97362a..e634c9efc 100644
--- a/application/forms/Config/GeneralForm.php
+++ b/application/forms/Config/GeneralForm.php
@@ -203,7 +203,7 @@ class GeneralForm extends Form
                 'label'     => 'Module Folder',
                 'required'  => true,
                 'helptext'  => 'The moduleFolder directive is currently not used anywhere but '
-                    . 'configureable via the frontend and ini. With feature #4607 moduleFolder '
+                    . 'configureable via the frontend and INI. With feature #4607 moduleFolder '
                     . 'will be replaced with a configuration directive for locations of '
                     . 'installed modules',
                 'value'     => $cfg->get('moduleFolder', $this->getConfigDir() . '/config/enabledModules')
@@ -275,7 +275,7 @@ class GeneralForm extends Form
                 'required'      => true,
                 'value'         => $backend,
                 'multiOptions'  => array(
-                    'ini'   => 'File System (ini Files)',
+                    'ini'   => 'File System (INI Files)',
                     'db'    => 'Database',
                     'null'  => 'Don\'t Store Preferences'
                 )
diff --git a/library/Icinga/Application/Web.php b/library/Icinga/Application/Web.php
index 100cf5153..af4f542d8 100644
--- a/library/Icinga/Application/Web.php
+++ b/library/Icinga/Application/Web.php
@@ -216,10 +216,12 @@ class Web extends ApplicationBootstrap
     }
 
     /**
-     * Registers a @see NullStore as the preference provider
+     * Registers a NullStore as the preference provider
      *
      * @param Preferences   $preferences    The preference registry to attach the NullStore to
      * @param User          $user           The user, required for API compliance
+     *
+     * @see   NullStore
      */
     private function registerFallbackPreferenceProvider($preferences, $user)
     {
diff --git a/public/index.php b/public/index.php
index 28a208270..891f736fb 100644
--- a/public/index.php
+++ b/public/index.php
@@ -2,7 +2,13 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
+/*
+ * Set timezone before bootstrapping the application and therefore before calling `setupTimezone()` because in case an
+ * error occurred whilst, the logger calls date/time functions which would generate a warning if the php.ini lacks a
+ * valid timezone.
+ */
 date_default_timezone_set('UTC');
+
 require_once dirname(__FILE__). '/../library/Icinga/Application/ApplicationBootstrap.php';
 require_once dirname(__FILE__). '/../library/Icinga/Application/Web.php';