diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html
index 394cd261..98d8c01c 100644
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkpersonalmonthlystatisticsview.html
@@ -15,7 +15,13 @@
             </div>
             {% endif %}
         </h1>
-        <h2>{% blocktrans %}{{ user }} has collected {{ n_fats }} link{{ n_fats|pluralize }} this month.{% endblocktrans %}</h2>
+        <h2>
+            {% blocktrans count links=n_fats %}
+                {{ user }} has collected one link this month.
+            {% plural %}
+                {{ user }} has collected {{ links }} links this month.
+            {% endblocktrans %}
+        </h2>
         <table class="table table-responsive">
             <tr>
                 <th class="col-md-2 text-center">{% trans "Ship" %}</th>
@@ -29,7 +35,13 @@
             {% endfor %}
         </table>
         {%  if created_fats %}
-         <h2>{% blocktrans %}{{ user }} has created {{ n_created_fats }} link{{ n_created_fats|pluralize }} this month.{% endblocktrans %}</h2>
+        <h2>
+            {% blocktrans count links=n_created_fats %}
+                {{ user }} has created one link this month.
+            {% plural %}
+                {{ user }} has created {{ links }} links this month.
+            {% endblocktrans %}
+        </h2>
         {% if created_fats %}
         <table class="table">
             <tr>
diff --git a/allianceauth/services/templates/services/service_confirm_delete.html b/allianceauth/services/templates/services/service_confirm_delete.html
index a1dab4b0..a2e1772e 100644
--- a/allianceauth/services/templates/services/service_confirm_delete.html
+++ b/allianceauth/services/templates/services/service_confirm_delete.html
@@ -2,7 +2,6 @@
 {% load i18n %}
 
 
-
 {% block page_title %}
     {% blocktrans with service_name=view.service_name|title %}Delete {{ service_name }} Account?{% endblocktrans %}
 {% endblock page_title %}
@@ -18,8 +17,8 @@
                     <form action="" method="post">
                         {% csrf_token %}
                         <p>
-                            {% blocktrans trimmed %}
-                            Are you sure you want to delete your {{ view.service_name }} account {{ object }}?
+                            {% blocktrans trimmed with service_name=view.service_name|title %}
+                            Are you sure you want to delete your {{ service_name }} account {{ object }}?
                             {% endblocktrans %}
                         </p>
                         <input class="btn btn-danger btn-block" type="submit" value="Confirm" />
diff --git a/allianceauth/templates/allianceauth/admin-status/overview.html b/allianceauth/templates/allianceauth/admin-status/overview.html
index af24cd2f..ecce642f 100644
--- a/allianceauth/templates/allianceauth/admin-status/overview.html
+++ b/allianceauth/templates/allianceauth/admin-status/overview.html
@@ -89,7 +89,7 @@
                     {% if task_queue_length < 0 %}
                         {% trans "Error retrieving task queue length" %}
                     {% else %}
-                        {% blocktrans count tasks=task_queue_length %}
+                        {% blocktrans trimmed count tasks=task_queue_length %}
                         {{ tasks }} task
                         {% plural %}
                         {{ tasks }} tasks