diff --git a/frontend/projects/ui/src/app/pages/notifications/notifications.page.html b/frontend/projects/ui/src/app/pages/notifications/notifications.page.html
index e0d9e7e63..4c23aba0d 100644
--- a/frontend/projects/ui/src/app/pages/notifications/notifications.page.html
+++ b/frontend/projects/ui/src/app/pages/notifications/notifications.page.html
@@ -84,7 +84,7 @@
             <h2>
               <b>
                 <span *ngIf="not['package-id'] as pkgId">
-                  {{ packageData[pkgId]?.manifest!.title || pkgId }} -
+                  {{ packageData[pkgId]?.manifest?.title || pkgId }} -
                 </span>
                 <ion-text [color]="getColor(not)"> {{ not.title }} </ion-text>
               </b>
@@ -112,7 +112,7 @@
             View Report
           </ion-button>
           <ion-button
-            *ngIf="not['package-id']"
+            *ngIf="not['package-id'] && packageData[not['package-id']]"
             slot="end"
             fill="clear"
             color="dark"
diff --git a/frontend/projects/ui/src/app/util/has-deps.ts b/frontend/projects/ui/src/app/util/has-deps.ts
index 115a09292..94b3fa4cd 100644
--- a/frontend/projects/ui/src/app/util/has-deps.ts
+++ b/frontend/projects/ui/src/app/util/has-deps.ts
@@ -1,7 +1,7 @@
 import { PackageDataEntry } from '../services/patch-db/data-model'
 
 export function hasCurrentDeps(pkg: PackageDataEntry): boolean {
-  return !!Object.keys(pkg.installed?.['current-dependents'] || {})
-    // @TODO fix Manifest type
-    .filter(depId => depId !== (pkg.manifest as any).id).length
+  return !!Object.keys(pkg.installed?.['current-dependents'] || {}).filter(
+    depId => depId !== pkg.manifest.id,
+  ).length
 }