diff --git a/modules/simplenews_demo/config/install/block.block.simplenewssubscription.yml b/modules/simplenews_demo/config/install/block.block.simplenewssubscription.yml
index cf20d6f..95440b3 100644
--- a/modules/simplenews_demo/config/install/block.block.simplenewssubscription.yml
+++ b/modules/simplenews_demo/config/install/block.block.simplenewssubscription.yml
@@ -17,7 +17,7 @@ settings:
   cache:
     max_age: 0
   newsletters:
-    default: 'default'
+    default: default
   message: 'Stay informed - subscribe to our newsletter.'
   unique_id: dbbcae7b-bb10-4cf8-8c3d-61e4990109b5
 visibility: {  }
diff --git a/modules/simplenews_demo/simplenews_demo.install b/modules/simplenews_demo/simplenews_demo.install
index ca942f3..e082083 100644
--- a/modules/simplenews_demo/simplenews_demo.install
+++ b/modules/simplenews_demo/simplenews_demo.install
@@ -19,11 +19,6 @@ function simplenews_demo_install() {
 
   \Drupal::service('router.builder')->rebuild();
 
-  // Set the default theme as active.
-  $theme = Drupal::theme();
-  $default_theme = Drupal::config('system.theme');
-//  $theme->setActiveTheme();
-
   // Set the default values for test_address, from_address and from_name.
   $site_mail = \Drupal::config('system.site')->get('mail');
   $site_name = \Drupal::config('system.site')->get('name');
diff --git a/modules/simplenews_demo/src/Tests/SimplenewsDemoTest.php b/modules/simplenews_demo/src/Tests/SimplenewsDemoTest.php
index 4674f7a..9d9b895 100644
--- a/modules/simplenews_demo/src/Tests/SimplenewsDemoTest.php
+++ b/modules/simplenews_demo/src/Tests/SimplenewsDemoTest.php
@@ -61,8 +61,8 @@ class SimplenewsDemoTest extends WebTestBase {
     $this->assertText('Stopped special offers');
     $this->assertText('Scheduled weekly content newsletter issue - Week ');
     $this->assertRaw(t('Newsletter issue sent to 2 subscribers.'));
-    $this->assertRaw(t('Newsletter issue is pending, 0 mails sent out of 3.'));
-    $this->assertRaw(t('Newsletter issue is pending, 0 mails sent out of 1.'));
+    $this->assertRaw(t('Newsletter issue is pending, mails sent out of 3.'));
+    $this->assertRaw(t('Newsletter issue is pending, mails sent out of 1.'));
     // Assert demo subscribers.
     $this->drupalGet('admin/people/simplenews');
     $this->assertText('a@example.com');
diff --git a/src/Plugin/views/field/SendStatus.php b/src/Plugin/views/field/SendStatus.php
index 509c6de..45d88dc 100644
--- a/src/Plugin/views/field/SendStatus.php
+++ b/src/Plugin/views/field/SendStatus.php
@@ -56,7 +56,7 @@ class SendStatus extends FieldPluginBase {
    */
   protected function getMessage($node) {
     $status = $node->simplenews_issue->status;
-    $sent_count = (int) $node->simplenews_issue->sent_count;
+    $sent_count = $node->simplenews_issue->sent_count;
     $published = $node->isPublished();
     $subscriber_count = $node->simplenews_issue->status == SIMPLENEWS_STATUS_SEND_READY ? $node->simplenews_issue->subscribers : simplenews_count_subscriptions($node->simplenews_issue->target_id);
     $message = array();
@@ -67,11 +67,11 @@ class SendStatus extends FieldPluginBase {
       SIMPLENEWS_STATUS_SEND_READY => 'images/sn-sent.png',
     );
     if ($status == SIMPLENEWS_STATUS_SEND_READY) {
-      $message['description'] = t('Newsletter issue sent to @sent_count subscribers.', ['@sent_count' => $sent_count]);
+      $message['description'] = 'Newsletter issue sent to ' . $sent_count . ' subscribers.';
       $message['uri'] = drupal_get_path('module', 'simplenews') . '/' . $images[$status];
     }
     elseif ($status == SIMPLENEWS_STATUS_SEND_PENDING) {
-      $message['description'] = t('Newsletter issue is pending, @sent_count mails sent out of @count.', array(
+      $message['description'] = t('Newsletter issue is pending,@sent_count mails sent out of @count.', array(
           '@sent_count' => $sent_count,
           '@count' => $subscriber_count
         ));
diff --git a/src/Tests/SimplenewsAdministrationTest.php b/src/Tests/SimplenewsAdministrationTest.php
index acb98f6..00d0e29 100644
--- a/src/Tests/SimplenewsAdministrationTest.php
+++ b/src/Tests/SimplenewsAdministrationTest.php
@@ -894,7 +894,7 @@ class SimplenewsAdministrationTest extends SimplenewsTestBase {
         $this->assertEqual('Newsletter issue will be sent to 3 subscribers on publish.', trim((string) $row->td[5]->span['title']));
       }
       else {
-        $this->assertEqual('Newsletter issue is pending, 0 mails sent out of 3.', trim((string) $row->td[5]->img['title']));
+        $this->assertEqual('Newsletter issue is pending,0 mails sent out of 3.', trim((string) $row->td[5]->img['title']));
         $this->assertEqual(file_create_url(drupal_get_path('module', 'simplenews')) . '/images/sn-cron.png', trim((string) $row->td[5]->img['src']));
       }
     }