diff --git a/src/app/shared/log-out/log-out.component.html b/src/app/shared/log-out/log-out.component.html
index ab398d1735..d522fc6fb9 100644
--- a/src/app/shared/log-out/log-out.component.html
+++ b/src/app/shared/log-out/log-out.component.html
@@ -1,6 +1,6 @@
 <div class="form-login px-4">
 
-  <div *ngIf="(error | async) && hasError" class="alert alert-danger" role="alert" @fadeOut>{{ error | async }}</div>
+  <div *ngIf="(error | async)" class="alert alert-danger" role="alert" @fadeOut>{{ error | async }}</div>
 
   <button class="btn btn-lg btn-primary btn-block mt-3" (click)="logOut()">{{"logout.form.submit" | translate}}</button>
 </div>
diff --git a/src/app/shared/log-out/log-out.component.ts b/src/app/shared/log-out/log-out.component.ts
index 0a6b936cd5..6fa71caa32 100644
--- a/src/app/shared/log-out/log-out.component.ts
+++ b/src/app/shared/log-out/log-out.component.ts
@@ -25,6 +25,7 @@ export class LogOutComponent implements OnInit {
   /**
    * @constructor
    * @param {Store<State>} store
+   * @param {Router} router
    */
   constructor(private router: Router,
               private store: Store<AppState>) {
diff --git a/src/app/shared/message-board/message/message.component.html b/src/app/shared/message-board/message/message.component.html
index d8637e87fe..e6dfe7dcb5 100644
--- a/src/app/shared/message-board/message/message.component.html
+++ b/src/app/shared/message-board/message/message.component.html
@@ -1,4 +1,4 @@
-<li *ngVar="m.findMetadata('dc.type') as type"
+<li *ngVar="m.firstMetadataValue('dc.type') as type"
     [ngClass]="{'float-left': (type == 'outbound' && isSubmitter) || (type == 'inbound' && !isSubmitter),
      'float-right': (type == 'outbound' && !isSubmitter) || (type == 'inbound' && isSubmitter),
       'clearfix':1}">
@@ -7,7 +7,7 @@
     <div class="header clearfix">
 
       <small class="float-left">
-        <span class="fa fa-clock text-muted ">{{m.findMetadata('dc.date.issued') | date: 'dd/MM/yyyy HH:mm'}}</span>
+        <span class="fa fa-clock text-muted ">{{m.firstMetadataValue('dc.date.issued') | date: 'dd/MM/yyyy HH:mm'}}</span>
       </small>
 
       <small
@@ -27,7 +27,7 @@
       <div class="truncatable">
         <ds-truncatable [id]="m.uuid">
           <ds-truncatable-part [id]="m.uuid" [minLines]="1">
-            <label>From: <span><strong>{{isSubmitter && type == 'inbound' ? 'You' : m.findMetadata('dc.creator')}}</strong></span></label>
+            <label>From: <span><strong>{{isSubmitter && type == 'inbound' ? 'You' : m.firstMetadataValue('dc.creator')}}</strong></span></label>
           </ds-truncatable-part>
         </ds-truncatable>
       </div>