diff --git a/src/Annotation/SearchApiDisplay.php b/src/Annotation/SearchApiDisplay.php
index 35cb95a..4515c9e 100644
--- a/src/Annotation/SearchApiDisplay.php
+++ b/src/Annotation/SearchApiDisplay.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\search_api\Annotation\SearchApiDisplay.
- */
-
 namespace Drupal\search_api\Annotation;
 
 use Drupal\Component\Annotation\Plugin;
diff --git a/src/Display/DisplayPluginManager.php b/src/Display/DisplayPluginManager.php
index 972d216..ff7739e 100644
--- a/src/Display/DisplayPluginManager.php
+++ b/src/Display/DisplayPluginManager.php
@@ -23,18 +23,10 @@ class DisplayPluginManager extends DefaultPluginManager {
    *
    * @see \Drupal\search_api\Display\DisplayPluginManager::getInstances()
    */
-  protected $displays;
+  protected $displays = NULL;
 
   /**
-   * Constructs a DisplayPluginManager object.
-   *
-   * @param \Traversable $namespaces
-   *   An object that implements \Traversable which contains the root paths
-   *   keyed by the corresponding namespace to look for plugin implementations.
-   * @param \Drupal\Core\Cache\CacheBackendInterface $cache_backend
-   *   Cache backend instance to use.
-   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
-   *   The module handler.
+   * {@inheritdoc}
    */
   public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, ModuleHandlerInterface $module_handler) {
     parent::__construct('Plugin/search_api/display', $namespaces, $module_handler, 'Drupal\search_api\Display\DisplayInterface', 'Drupal\search_api\Annotation\SearchApiDisplay');
@@ -48,7 +40,7 @@ class DisplayPluginManager extends DefaultPluginManager {
    *   An array of display plugins, keyed by type identifier.
    */
   public function getInstances() {
-    if (!isset($this->displays)) {
+    if ($this->displays === NULL) {
       $this->displays = array();
 
       foreach ($this->getDefinitions() as $name => $display_definition) {
diff --git a/src/Plugin/search_api/display/ViewsPageDisplay.php b/src/Plugin/search_api/display/ViewsPageDisplay.php
index bfa8d54..b1af1fe 100644
--- a/src/Plugin/search_api/display/ViewsPageDisplay.php
+++ b/src/Plugin/search_api/display/ViewsPageDisplay.php
@@ -7,7 +7,7 @@ use Drupal\search_api\Display\DisplayPluginBase;
 use Drupal\views\Views;
 
 /**
- * Represents a display which represents the Search API views.
+ * Represents a views page display.
  *
  * @SearchApiDisplay(
  *   id = "views_page",
diff --git a/src/Plugin/search_api/display/ViewsPageDisplayDeriver.php b/src/Plugin/search_api/display/ViewsPageDisplayDeriver.php
index 933867a..97200f0 100644
--- a/src/Plugin/search_api/display/ViewsPageDisplayDeriver.php
+++ b/src/Plugin/search_api/display/ViewsPageDisplayDeriver.php
@@ -8,7 +8,7 @@ use Drupal\search_api\Display\DisplayDeriverBase;
 use Drupal\search_api\Plugin\views\query\SearchApiQuery;
 
 /**
- * Derives a display plugin definition for every Search API view.
+ * Derives a display plugin definition for every Search API views page.
  *
  * @see \Drupal\search_api\Plugin\search_api\display\ViewsPageDisplay
  */
@@ -52,7 +52,7 @@ class ViewsPageDisplayDeriver extends DisplayDeriverBase {
                 '%view_name' => $view->label(),
                 '%display_title' => $display_info['display_title']
               );
-              $label = $this->t('View %view_label, display %display_title', $label_arguments);
+              $label = $this->t('View %view_name, display %display_title', $label_arguments);
 
               $plugin_derivatives[$machine_name] = array(
                 'id' => $base_plugin_id . PluginBase::DERIVATIVE_SEPARATOR . $machine_name,